2023-3-20 添加一个部门或者实验室id。

zd-model/src/main/java/com/zd/model/entity/SysDept.java

@@ -99,6 +99,11 @@ public class SysDept extends BaseEntity {
     private Integer subOrDept;
 
     /**
+     * 部门或者实验室id
+     */
+    private Integer subOrDeptId;
+
+    /**
      * 子部门
      */
     private List<SysDept> children = new ArrayList<SysDept>();
@@ -245,6 +250,14 @@ public class SysDept extends BaseEntity {
         this.subOrDept = subOrDept;
     }
 
+    public Integer getSubOrDeptId() {
+        return subOrDeptId;
+    }
+
+    public void setSubOrDeptId(Integer subOrDeptId) {
+        this.subOrDeptId = subOrDeptId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

zd-modules/zd-modules-system/src/main/java/com/zd/system/domain/vo/TreeSelect.java

@@ -43,6 +43,11 @@ public class TreeSelect implements Serializable {
     private Integer subOrDept;
 
     /**
+     * 部门或者实验室id
+     */
+    private Integer subOrDeptId;
+
+    /**
      * 子节点
      */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -59,6 +64,7 @@ public class TreeSelect implements Serializable {
         this.ancestors = dept.getAncestors();
         this.deptNum = dept.getDeptNum();
         this.subOrDept = dept.getSubOrDept();
+        this.subOrDeptId = dept.getSubOrDeptId();
         this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
     }
 
@@ -123,4 +129,12 @@ public class TreeSelect implements Serializable {
     public void setSubOrDept(Integer subOrDept) {
         this.subOrDept = subOrDept;
     }
+
+    public Integer getSubOrDeptId() {
+        return subOrDeptId;
+    }
+
+    public void setSubOrDeptId(Integer subOrDeptId) {
+        this.subOrDeptId = subOrDeptId;
+    }
 }

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

@@ -215,13 +215,13 @@
     </select>
     <select id="treeDeptSubSel" resultType="com.zd.model.entity.SysDept">
         select d.* from (
-            select d.dept_id,d.parent_id,d.ancestors,d.dept_name,d.del_flag,1 subOrDept
+            select d.dept_id,d.parent_id,d.ancestors,d.dept_name,d.del_flag,1 subOrDept,d.dept_id subOrDeptId
             from sys_dept d
 
             union all
 
-            select s.build_id dept_id,s.dept_id parent_id,(select dt.ancestors
-            from sys_dept dt where dt.dept_id = s.build_id) ancestors,s.name dept_name,s.is_del del_flag,2 subOrDept
+            select concat(10000,s.id) dept_id,s.build_id parent_id,(select dt.ancestors
+            from sys_dept dt where dt.dept_id = s.build_id) ancestors,s.name dept_name,s.is_del del_flag,2 subOrDept,s.id subOrDeptId
             from lab_subject s
         )d
         where d.del_flag = '0'