修改代码

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DynamicFormInstanceMapper.xml

@@ -225,6 +225,15 @@
         cb_duty_shift ds
         where
         d.instanceId = ps.instance_id
+        and d.deptId not in (SELECT
+        `cb_org_usr`.`sequence_nbr`
+        FROM
+        `cb_org_usr`
+        WHERE
+        (
+        ( `cb_org_usr`.`biz_org_code` LIKE concat( ( SELECT `cb_org_usr`.`biz_org_code` FROM `cb_org_usr` WHERE ( `cb_org_usr`.`sequence_nbr` = 1435847345328660481 ) ), '%' ) )
+        AND ( `cb_org_usr`.`biz_org_type` = 'DEPARTMENT' )
+        ))
         and ps.shift_id = ds.sequence_nbr
         and ps.duty_date = #{dutyDate}
         <if test="shiftId != null and shiftId != ''">

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ESAlertCalledService.java

@@ -312,7 +312,6 @@ public class ESAlertCalledService {
 		//过滤120警情
 		BoolQueryBuilder qb6 = QueryBuilders.boolQuery()
 				.mustNot(QueryBuilders.termQuery("alertTypeCode", "1214"));
-		boolMust.should(qb6);
 
 		if (!ValidationUtil.isEmpty(alertCalledVo.getAlertFormValue())){
 			List<AlertFormValue> alertFormValue = alertCalledVo.getAlertFormValue();
@@ -343,8 +342,9 @@ public class ESAlertCalledService {
          */
 
 
-      //  boolMust.minimumShouldMatch(1);//至少满足一个
+        boolMust.minimumShouldMatch(1);//至少满足一个
         boolMustAll.must(boolMust);
+        boolMustAll.must(qb6);
 
 
 
@@ -456,6 +456,7 @@ public class ESAlertCalledService {
 		boolMust.minimumShouldMatch(1);//至少满足一个
 
 		boolMustAll.must(boolMust);
+		boolMustAll.must(qb4);
 
 
 
@@ -464,10 +465,9 @@ public class ESAlertCalledService {
 				// 分页
 				.withPageable(PageRequest.of(current, size))
 				// 排序
-//                .withSort(SortBuilders.fieldSort("callTimeLong").order(SortOrder.DESC))
+                .withSort(SortBuilders.fieldSort("callTimeLong").order(SortOrder.DESC))
 				//过滤条件
 				.withQuery(boolMustAll)
-				.withQuery(qb4)
 				;