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

!203 BUG修复 

Merge pull request !203 from dxfeng/feature/dxf
This commit is contained in:
dxfeng 2022-08-22 07:06:38 +00:00 committed by Gitee
parent ed3b6a5e06 564b30eed8
commit db3c5e0f5c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/organization/mapper/scheme/GradeMapper.xml
View File

@ -56,7 +56,7 @@
</select>
<select id="listUsedId" resultType="java.lang.String">
select grade_id
from JCL_ORG_JOBDT
from JCL_ORG_JOB
where delete_type = 0
</select>
<select id="getGradeNameByIds" resultType="java.lang.String">

2
src/com/engine/organization/mapper/scheme/LevelMapper.xml
View File

@ -72,7 +72,7 @@
where delete_type = 0
union
select level_id
from JCL_ORG_JOBDT
from JCL_ORG_JOB
where delete_type = 0
</select>
<select id="getTreeData" resultMap="TreeResultMap">

8
src/com/engine/organization/service/impl/DepartmentServiceImpl.java
View File

@ -460,6 +460,14 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
DepartmentPO targetDepartment = getDepartmentMapper().getDeptById(mergeParam.getDepartment());
Long parentComp = targetDepartment.getParentComp();
Set<Long> disableIds = new HashSet<>();
disableIds.add(mergeParam.getId());
List<DepartmentPO> deptListByPId = getDepartmentMapper().getDeptListByPId(mergeParam.getId());
if (CollectionUtils.isNotEmpty(deptListByPId)) {
addDisableIds(disableIds, deptListByPId);
}
OrganizationAssert.isFalse(disableIds.contains(targetDepartment.getId()), "请勿选择当前部门本身及其子部门");
// 所选部门
DepartmentPO mergeDepartment = getDepartmentMapper().getDeptById(mergeParam.getId());
mergeDepartment.setDeptName(mergeParam.getMergeName());

16
src/com/engine/organization/service/impl/GroupServiceImpl.java
View File

@ -32,9 +32,10 @@ public class GroupServiceImpl extends Service implements GroupService {
Map<String, Object> apiDatas = new HashMap<>();
List<SearchConditionItem> selectItems = new ArrayList<>();
List<SearchConditionGroup> addGroups = new ArrayList<>();
SearchConditionItem companyNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 1, 50, "总部名称", "companyname");
SearchConditionItem companyDescItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 1, 50, "总部全称", "companydesc");
SearchConditionItem companyWebItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 1, 60, "公司网站", "companyweb");
SearchConditionItem companyNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "总部名称", "companyname");
companyNameItem.setRules("required|string");
SearchConditionItem companyDescItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "总部全称", "companydesc");
SearchConditionItem companyWebItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 60, "公司网站", "companyweb");
// 赋值
String id = Util.null2String(params.get("id"));
@ -57,11 +58,10 @@ public class GroupServiceImpl extends Service implements GroupService {
// 设置编辑属性
if (!StringUtil.isEmpty(Util.null2String(params.get("viewattr")))) {
int viewAttr = Integer.parseInt(params.get("viewattr").toString());
companyNameItem.setViewAttr(viewAttr);
companyDescItem.setViewAttr(viewAttr);
companyWebItem.setViewAttr(viewAttr);
if ("1".equals(Util.null2String(params.get("viewattr")))) {
companyNameItem.setViewAttr(1);
companyDescItem.setViewAttr(1);
companyWebItem.setViewAttr(1);
}
selectItems.add(companyNameItem);