修改bug

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpChemicalServiceImpl.java

@@ -511,6 +511,9 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
     public void indicatorMonitoring() {
         List<Map<String, Object>> list = hxpChemicalMapper.queryCriticaliBySubId(new ArrayList<>());
         if(!list.isEmpty()){
+            if(list.get(0) == null){
+                list.remove(0);
+            }
 
             list.forEach(map -> {
                 if(BigDecimal.valueOf(1L).compareTo(BigDecimal.valueOf(Double.parseDouble(map.get("criticali")+""))) < 0){

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

@@ -32,19 +32,19 @@
         <include refid="selectLabWhitelistListVo"/>
         <where>
             <if test="userId != null "> and t.user_id = #{userId}</if>
-            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
-            <if test="userNumber != null  and userNumber != ''"> and user_number = #{userNumber}</if>
-            <if test="userTelephone != null  and userTelephone != ''"> and user_telephone = #{userTelephone}</if>
-            <if test="userType != null  and userType != ''"> and user_type = #{userType}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
-            <if test="createUser != null  and createUser != ''"> and create_user = #{createUser}</if>
-            <if test="createId != null "> and create_id = #{createId}</if>
+            <if test="userName != null  and userName != ''"> and t.user_name like concat('%', #{userName}, '%')</if>
+            <if test="userNumber != null  and userNumber != ''"> and t.user_number = #{userNumber}</if>
+            <if test="userTelephone != null  and userTelephone != ''"> and t.user_telephone = #{userTelephone}</if>
+            <if test="userType != null  and userType != ''"> and t.user_type = #{userType}</if>
+            <if test="deptId != null "> and t.dept_id = #{deptId}</if>
+            <if test="deptName != null  and deptName != ''"> and t.dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="createUser != null  and createUser != ''"> and t.create_user = #{createUser}</if>
+            <if test="createId != null "> and t.create_id = #{createId}</if>
             <if test="searchValue != null and searchValue != ''">
                 and
-                (user_name like concat('%', #{searchValue}, '%') or
-                user_number like concat('%', #{searchValue}, '%') or
-                user_telephone like concat('%', #{searchValue}, '%'))
+                (t.user_name like concat('%', #{searchValue}, '%') or
+                t.user_number like concat('%', #{searchValue}, '%') or
+                t.user_telephone like concat('%', #{searchValue}, '%'))
             </if>
             <!-- 数据范围过滤 -->
             ${params.dataScope}