!224 bug修复

Merge pull request !224 from reset/feature/cl

src/com/engine/organization/entity/TreeData.java

@@ -20,5 +20,6 @@ import java.util.ArrayList;
 public class TreeData {
     private String title;
     private String key;
+    private Integer status;
     private ArrayList<TreeData> children;
 }

src/com/engine/organization/mapper/scheme/SchemeMapper.xml

@@ -16,6 +16,7 @@
     <resultMap id="TreeResultMap" type="com.engine.organization.entity.TreeData">
         <result column="id" property="key"/>
         <result column="scheme_name" property="title"/>
+        <result column="forbidden_tag" property="status"/>
     </resultMap>
 
     <!-- 表字段 -->
@@ -74,9 +75,9 @@
         where delete_type = 0
     </select>
     <select id="getTreeData" resultMap="TreeResultMap">
-        select id, scheme_name
+        select id, scheme_name,forbidden_tag
         from jcl_org_scheme
-        where delete_type = '0' and forbidden_tag = 0
+        where delete_type = '0'
     </select>
     <select id="getSchemesByIds" resultMap="BaseResultMap">
         select

src/com/engine/organization/service/impl/SchemeServiceImpl.java

@@ -158,7 +158,7 @@ public class SchemeServiceImpl extends Service implements SchemeService {
                         TypeTreeVO.builder()
                                 .domid(e.getKey())
                                 .key(Long.parseLong(e.getKey()))
-                                .name(e.getTitle())
+                                .name(e.getStatus() == 0 ? e.getTitle() : e.getTitle()+"(已禁用)")
                                 .build()).collect(Collectors.toList()))
                 .haschild(true)
                 .domid("-1")