BUG 1996 大屏可视化-安全隐患统计查看更多，通过隐患类型查询有误（按条件查询接口500）

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabCheckOptionServiceImpl.java

@@ -1,29 +1,22 @@
 package com.zd.laboratory.service.impl;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
-import com.zd.model.domain.per.PerPrefix;
-import com.zd.common.core.exception.ServiceException;
-import com.zd.common.core.utils.DateUtils;
-import com.zd.common.core.utils.PageHelperUtil;
-import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.utils.StringUtils;
-import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.annotation.DataScope;
-import com.zd.common.core.utils.SaveUtil;
-
+import com.zd.common.core.exception.ServiceException;
+import com.zd.common.core.utils.*;
+import com.zd.laboratory.domain.LabCheckOption;
 import com.zd.laboratory.domain.vo.LabCheckOptionExcelVo;
 import com.zd.laboratory.domain.vo.LabCheckOptionStatisticsVo;
+import com.zd.laboratory.mapper.LabCheckOptionMapper;
+import com.zd.laboratory.service.ILabCheckOptionService;
+import com.zd.model.domain.per.PerPrefix;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zd.laboratory.mapper.LabCheckOptionMapper;
-import com.zd.laboratory.domain.LabCheckOption;
-import com.zd.laboratory.service.ILabCheckOptionService;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.constraints.NotNull;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 检查项选项Service业务层处理
@@ -503,7 +496,7 @@ public class LabCheckOptionServiceImpl implements ILabCheckOptionService {
 
             List<LabCheckOption> optionList = selectLabCheckOptionList(new LabCheckOption());
             for (LabCheckOption option1 : optionList) {
-                if(labCheckOptionStatisticsVo.getOptionId().equals(option1.getId()+"")){
+                if(labCheckOptionStatisticsVo.getOptionId().equals(option1.getId())){
 
                     labCheckOptionStatisticsVo.setIds(getAllChildrenIds(option1));
                     break;

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabCheckOptionMapper.xml

@@ -139,10 +139,12 @@
             left join lab_safe_classified sf on sf.id = s.level
         where r.is_fabu = 1
           <if test="optionId != null and optionId != ''">
-            and co.id in
-              <foreach item="id" collection="ids" open="(" separator="," close=")">
-                  #{id}
-              </foreach>
+              <if test="ids != null and ids != ''">
+                  and co.id in
+                  <foreach item="id" collection="ids" open="(" separator="," close=")">
+                      #{id}
+                  </foreach>
+              </if>
           </if>
             <if test="subId != null and subId != ''">
                 and r.laboratory_id = #{subId}