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

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

This commit is contained in:
lvleigang 2024-05-31 09:16:43 +08:00
parent 4609a4c91d 8fa52f957b
commit e5de3e90fd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
View File

@ -736,7 +736,7 @@ public class MdmServiceImpl implements IMdmService {
maps.put("tableName", mainMdmModuleDb.getDbName());//表名 maps.put("tableName", mainMdmModuleDb.getDbName());//表名
maps.put("tableRemark", mainMdmModuleDb.getRemark());//表备注 maps.put("tableRemark", mainMdmModuleDb.getRemark());//表备注
maps.put("databaseFields", dbFiledsDtos);//字段 maps.put("databaseFields", dbFiledsDtos);//字段
//mdmModuleDao.alterTable(maps); mdmModuleDao.alterTable(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>