用户管理过滤掉已禁用部门(IB5H7F)

@@ -4,8 +4,10 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.common.utils.StringUtils;
 
 
 /**
 /**
  * Treeselect树结构实体类
  * Treeselect树结构实体类
@@ -22,6 +24,9 @@ public class TreeSelect implements Serializable
     /** 节点名称 */
     /** 节点名称 */
     private String label;
     private String label;
 
 
+    /** 节点禁用 */
+    private boolean disabled = false;
+
     /** 子节点 */
     /** 子节点 */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<TreeSelect> children;
     private List<TreeSelect> children;
@@ -35,6 +40,7 @@ public class TreeSelect implements Serializable
     {
     {
         this.id = dept.getDeptId();
         this.id = dept.getDeptId();
         this.label = dept.getDeptName();
         this.label = dept.getDeptName();
+        this.disabled = StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus());
         this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
         this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
     }
     }
 
 
@@ -65,6 +71,16 @@ public class TreeSelect implements Serializable
         this.label = label;
         this.label = label;
     }
     }
 
 
+    public boolean isDisabled()
+    {
+        return disabled;
+    }
+
+    public void setDisabled(boolean disabled)
+    {
+        this.disabled = disabled;
+    }
+
     public List<TreeSelect> getChildren()
     public List<TreeSelect> getChildren()
     {
     {
         return children;
         return children;

@@ -105,7 +105,7 @@
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
             <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+              <treeselect v-model="form.deptId" :options="enabledDeptOptions" :show-count="true" placeholder="请选择归属部门" />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
@@ -230,8 +230,10 @@ export default {
       userList: null,
       userList: null,
       // 弹出层标题
       // 弹出层标题
       title: "",
       title: "",
-      // 部门树选项
+      // 所有部门树选项
       deptOptions: undefined,
       deptOptions: undefined,
+      // 过滤掉已禁用部门树选项
+      enabledDeptOptions: undefined,
       // 是否显示弹出层
       // 是否显示弹出层
       open: false,
       open: false,
       // 部门名称
       // 部门名称
@@ -343,6 +345,19 @@ export default {
     getDeptTree() {
     getDeptTree() {
       deptTreeSelect().then(response => {
       deptTreeSelect().then(response => {
         this.deptOptions = response.data;
         this.deptOptions = response.data;
+        this.enabledDeptOptions = this.filterDisabledDept(JSON.parse(JSON.stringify(response.data)));
+      });
+    },
+    // 过滤禁用的部门
+    filterDisabledDept(deptList) {
+      return deptList.filter(dept => {
+        if (dept.disabled) {
+          return false;
+        }
+        if (dept.children && dept.children.length) {
+          dept.children = this.filterDisabledDept(dept.children);
+        }
+        return true;
       });
       });
     },
     },
     // 筛选节点
     // 筛选节点