修改bug

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/LabSubject.java

@@ -50,6 +50,8 @@ public class LabSubject extends BaseEntity implements QCInterface {
     @Excel(name = "实验室房间号")
     private String room = "";
 
+    private String roomName = "";
+
     /**
      * 部门id
      */
@@ -518,4 +520,12 @@ public class LabSubject extends BaseEntity implements QCInterface {
     public void setDeptIds(List<Long> deptIds) {
         this.deptIds = deptIds;
     }
+
+    public String getRoomName() {
+        return roomName;
+    }
+
+    public void setRoomName(String roomName) {
+        this.roomName = roomName;
+    }
 }

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

@@ -272,6 +272,9 @@ public class SysDeptController extends BaseController {
     @GetMapping("/filterDept")
     public AjaxResult filterDept() {
         SysDept sysDept1 = deptService.selectDeptById(tokenService.getLoginUser().getSysUser().getDeptId());
+        if(sysDept1 == null){
+            return AjaxResult.success();
+        }
         if(sysDept1.getParentId()==0){
             SysDept sysDept = new SysDept();
             sysDept.setParentId(sysDept1.getDeptId());

zd-modules/zd-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -184,6 +184,8 @@
             u.phonenumber like concat('%', #{searchValue}, '%')
             or
             ut.nick_name like concat('%', #{searchValue}, '%')
+            or
+            p.post_name like concat('%', #{searchValue}, '%')
             )
         </if>
         <if test="grade != null and grade != ''">