hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project

This commit is contained in:
yuqh 2024-05-31 09:27:29 +08:00
parent 4ae596fc38 e5de3e90fd
commit 2864ee5fba
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java
View File

@ -31,6 +31,8 @@ public class MdmModuleDaoImpl extends MybatisGenericDao<MdmModuleEntity, String>
return o; return o;
} }
@Override @Override
public Integer checkTable(Map<String, String> maps) { public Integer checkTable(Map<String, String> maps) {
Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "checkTable", maps); Integer o = (Integer) super.selectOne(getSqlIdPrifx() + "checkTable", maps);

2
service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTaskParameter/entity/SysIntegratedForegroundTaskParameterEntity.xml
View File

@ -252,7 +252,7 @@ update sys_integrated_foreground_task_parameter set sts= 'N' ,modify_time = #{m
<if test="org_id != null and org_id != ''"> and a.org_id = #{org_id} </if> <if test="org_id != null and org_id != ''"> and a.org_id = #{org_id} </if>
and a.sts='Y' and a.sts='Y'
</trim> </trim>
<if test=" sort == null or sort == ''.toString() "> order by a.sorts asc</if> <if test=" sort == null or sort == ''.toString() "> order by a.sorts desc</if>
<if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if> <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
</select> </select>
</mapper> </mapper>