优化代码

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

@@ -536,45 +536,44 @@
         LEFT JOIN lab_hazard hd  ON sd.`dict_value` = hd.`hazard_type_mode`
         LEFT JOIN lab_hazard_subject_relation hsr ON hsr.hazard_id = hd.`id`
         LEFT JOIN lab_subject st ON hsr.`subject_id` = st.`id`
-        WHERE sd.`dict_type` = 'lab_hazard_type' AND sd.`dict_value`=1
-        <!-- 数据范围过滤 -->
         ${params.dataScope}
+        WHERE sd.`dict_type` = 'lab_hazard_type' AND sd.`dict_value`=1
+
 
         UNION ALL
         SELECT sd.`dict_label` dictLabel,sd.`dict_value` dictValue,SUM(CASE WHEN (hsr.id IS NULL OR st.id IS NULL) THEN 0 ELSE  1 END) totalNum,'瓶' unit FROM sys_dict_data sd
         LEFT JOIN lab_hazard hd  ON sd.`dict_value` = hd.`hazard_type_mode`
         LEFT JOIN lab_hazard_subject_relation hsr ON hsr.hazard_id = hd.`id`
         LEFT JOIN lab_subject st ON hsr.`subject_id` = st.`id`
-        WHERE sd.`dict_type` = 'lab_hazard_type' AND sd.`dict_value`=2
-        <!-- 数据范围过滤 -->
         ${params.dataScope}
+        WHERE sd.`dict_type` = 'lab_hazard_type' AND sd.`dict_value`=2
+
 
         UNION ALL
         SELECT sd.`dict_label` dictLabel,sd.`dict_value` dictValue,SUM(CASE WHEN (hsr.id IS NULL OR st.id IS NULL) THEN 0 ELSE  1 END) totalNum,'台' unit FROM sys_dict_data sd
         LEFT JOIN lab_hazard hd  ON sd.`dict_value` = hd.`hazard_type_mode`
         LEFT JOIN lab_hazard_subject_relation hsr ON hsr.hazard_id = hd.`id`
         LEFT JOIN lab_subject st ON  hsr.`subject_id` = st.`id`
-        WHERE sd.`dict_type` = 'lab_hazard_type' AND sd.`dict_value`=3
-        <!-- 数据范围过滤 -->
         ${params.dataScope}
+        WHERE sd.`dict_type` = 'lab_hazard_type' AND sd.`dict_value`=3
 
         UNION ALL
         SELECT sd.`dict_label` dictLabel,sd.`dict_value` dictValue,SUM(CASE WHEN (hsr.id IS NULL OR st.id IS NULL) THEN 0 ELSE  1 END) totalNum,'台' unit FROM sys_dict_data sd
         LEFT JOIN lab_hazard hd  ON sd.`dict_value` = hd.`hazard_type_mode`
         LEFT JOIN lab_hazard_subject_relation hsr ON hsr.hazard_id = hd.`id`
         LEFT JOIN lab_subject st ON hsr.`subject_id` = st.`id`
-        WHERE sd.`dict_type` = 'lab_hazard_type' AND sd.`dict_value`=4
-        <!-- 数据范围过滤 -->
         ${params.dataScope}
+        WHERE sd.`dict_type` = 'lab_hazard_type' AND sd.`dict_value`=4
+
 
         UNION ALL
         SELECT sd.`dict_label` dictLabel,sd.`dict_value` dictValue,SUM(CASE WHEN (hsr.id IS NULL OR st.id IS NULL) THEN 0 ELSE  1 END) totalNum,NULL unit FROM sys_dict_data sd
         LEFT JOIN lab_hazard hd  ON sd.`dict_value` = hd.`hazard_type_mode`
         LEFT JOIN lab_hazard_subject_relation hsr ON hsr.hazard_id = hd.`id`
         LEFT JOIN lab_subject st ON hsr.`subject_id` = st.`id`
-        WHERE sd.`dict_type` = 'lab_hazard_type' AND sd.`dict_value`=5
-        <!-- 数据范围过滤 -->
         ${params.dataScope}
+        WHERE sd.`dict_type` = 'lab_hazard_type' AND sd.`dict_value`=5
+
     </select>
 
     <select id="queryNameCount" resultType="java.lang.Integer">

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysUserController.java

@@ -604,7 +604,6 @@ public class SysUserController extends BaseController {
     @DataScope(deptAlias = "d", userAlias = "u", permi = PerPrefix.SYSTEM_USER_TEACHER)
     @GetMapping("/selectUserListByName")
     public ResultData selectUserListByName(SysUser sysUser) {
-        if (StrUtil.isBlank(sysUser.getUserType())) return ResultData.success(new ArrayList<>());
         sysUser.setUserType(StringUtils.isEmpty(sysUser.getUserType()) ? "11" : sysUser.getUserType());//用户身份 11教职工 22学生
         startPage();
         List<SysUser> list = userService.selectUserListByName(sysUser);