diff --git a/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java b/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java index 93640606..c0048262 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java @@ -250,7 +250,6 @@ public class AIWarningController extends BaseController { if (user != null) { pd.put("NAME", user.getString("name")); } - pd.put("FOREIGN_ID", pd.getString("AIWARNING_ID")); pd.put("hiddenList", keyprojectHiddenService.listAllInspection(pd)); map.put("pd", pd); map.put("result", errInfo); diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml index 0437a004..5d83bc3d 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml @@ -1136,6 +1136,7 @@ from f left join `qa-gwj-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART + left join `qa-gwj-regulatory`.bus_aiwarning ai on ai.HIDDEN_IDS like CONCAT('%',f.HIDDEN_ID,'%') left join lv on f.HIDDENLEVEL = lv.BIANMA left join ht on f.HIDDENTYPE = ht.BIANMA left join ht2 on f.HIDDENTYPE2 = ht2.BIANMA and ht2.PARENT_ID = '18c0a9aea6e54feab9f4ab3f46e0bc86' @@ -1145,15 +1146,8 @@ left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR where f.ISDELETE = '0' - - and f.FOREIGN_ID = #{FOREIGN_ID} - - - - and f.HIDDEN_ID in - - #{item} - + + and ai.AIWARNING_ID = #{AIWARNING_ID} and @@ -1626,6 +1620,9 @@ FROM and P.HANDLED = '1' AND ( c.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} OR h.FOREIGN_ID = #{pd.OUTSOURCED_ID} ) + + and h.CREATOR like (case when h.SOURCE = '1' then CONCAT('%', #{pd.CREATOR},'%') else '%' end) + and (