Merge branch 'dev-merge-pre-secrity-kdhc' of http://192.168.1.43:3000/v2/zd-parents into dev-merge-pre-secrity-kdhc

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/onemachine/service/OneMachineService.java

@@ -412,6 +412,7 @@ public class OneMachineService implements ValidationSignInPerInfo {
      * @return
      */
     public R commitSign(Long id) {
+        logger.info("*************id:{}",id);
         String key = BaseConstants.SINGIN_id_KEY + id;
         logger.info("commitSign starting,id:{}",id);
         Long subId = redisService.getCacheObject(key);

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

@@ -557,7 +557,7 @@
     </select>
     <select id="selectLabRiskPlanByRiskPlanId" resultType="com.zd.laboratory.domain.LabRiskPlan">
             SELECT DISTINCT
-                (CONCAT( d.dept_name,'-',s.`name`,'-',s.room )) topName,
+                (CONCAT( d.dept_class_name,'-',s.`name`,'-',lbfl.room_num )) topName,
                 s.`floor_id` floorId
             FROM lab_subject s
                 LEFT JOIN sys_dept d ON d.dept_id = s.build_id

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

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