bug修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -83,6 +83,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static com.yeejoin.amos.latentdanger.business.util.RandomUtil.buildOrderNo;
 import static org.typroject.tyboot.core.foundation.context.RequestContext.getProduct;
@@ -1800,9 +1801,13 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             }
         }
 
-        if (!ValidationUtil.isEmpty(pageParam.get("dangerState"))) {
-            List<String> state = Lists.newArrayList(((String) pageParam.get("dangerState")).split(","));
-            pageParam.put("dangerState", state);
+        if (!ValidationUtil.isEmpty(pageParam.get("dangerState")) || pageParam.get("dangerState") == "") {
+            if (ValidationUtil.isEmpty(pageParam.get("dangerState"))) {
+                pageParam.put("dangerState", null);
+            } else {
+                List<String> state = Lists.newArrayList(((String) pageParam.get("dangerState")).split(","));
+                pageParam.put("dangerState", state);
+            }
         }
         if (!ValidationUtil.isEmpty(dangerIdList)) {
             pageParam.put("dangerIds", dangerIdList);

amos-boot-system-latentdanger/src/main/resources/db/mapper/LatentDangerMapper.xml

@@ -429,7 +429,7 @@
         INTERVAL 8 HOUR)), ld.reform_limit_date ) -- 截止日期到当天早上8:00:00分钟数
         AND ld.overtime_state = 0
         AND ld.deleted = 0
-        <if test="dangerState != null and dangerState != ''" >
+        <if test="dangerState != null and dangerState != ''">
             AND ld.danger_state in (#{dangerState});
         </if>
 
@@ -972,7 +972,7 @@
                         #{id}
                     </foreach>
                 </if>
-                <if test="key == 'dangerState' and value != null">
+                <if test="key == 'dangerState' and value != null and !value.isEmpty()">
                     and a.danger_state IN
                     <foreach collection="value" item="state" open="(" separator="," close=")">
                         #{state}
@@ -993,7 +993,7 @@
                 <if test="key == 'reformType' and value != null and value != ''">
                     and a.reform_type = #{value}
                 </if>
-                <if test="key == 'structureIdList' and value != null">
+                <if test="key == 'structureIdList' and value != null and value != ''">
                     and a.structure_id in
                     <foreach collection="value" item="structureId" open="(" separator="," close=")">
                         #{structureId}