liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!224 bug修复 

Merge pull request !224 from reset/feature/cl
This commit is contained in:
reset 2022-09-02 09:49:26 +00:00 committed by Gitee
parent 607030f02c 0ffb0bac33
commit 38a1fca585
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/engine/organization/entity/TreeData.java
View File

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

5
src/com/engine/organization/mapper/scheme/SchemeMapper.xml
View File

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

2
src/com/engine/organization/service/impl/SchemeServiceImpl.java
View File

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