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

!69 BUG修复 

Merge pull request !69 from dxfeng/feature/dxf
This commit is contained in:
dxfeng 2022-06-08 02:38:55 +00:00 committed by Gitee
parent 153b34205d ec4e92e113
commit 28cbc16ef3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,6 @@ public class GroupServiceImpl extends Service implements GroupService {
@Override
public Map<String, Object> getGroupFormField(Map<String, Object> params) {
HasRightUtil.hasRight(user, RIGHT_NAME, false);
Map<String, Object> apiDatas = new HashMap<>();
List<SearchConditionItem> selectItems = new ArrayList<>();
List<SearchConditionGroup> addGroups = new ArrayList<>();

11
src/com/engine/organization/service/impl/StaffServiceImpl.java
View File

@ -107,6 +107,7 @@ public class StaffServiceImpl extends Service implements StaffService {
// 更新编制表
staffPO.setStaffNum(staffPO.getStaffNum() + changeNum);
}
OrganizationAssert.isFalse(staffPO.getStaffNum() < 0, "调整后编制数小于0，请更正");
StaffBO.buildStaffDesc(staffPO);
// 更新主表
return getStaffMapper().updateStaff(staffPO);
@ -205,7 +206,6 @@ public class StaffServiceImpl extends Service implements StaffService {
SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 60, "描述说明", "description");
// 编辑状态下赋值操作
String id = Util.null2String(params.get("id"));
if (!StringUtil.isEmpty(id)) {
@ -233,7 +233,7 @@ public class StaffServiceImpl extends Service implements StaffService {
jobIdItem.setBrowserConditionParam(jobIdItemBean);
staffNumItem.setValue(staffPO.getStaffNum());
controlPolicyItem.setValue(staffPO.getControlPolicy()+"");
controlPolicyItem.setValue(staffPO.getControlPolicy() + "");
descriptionItem.setValue(staffPO.getDescription());
}
selectItems.add(planIdItem);
@ -243,9 +243,12 @@ public class StaffServiceImpl extends Service implements StaffService {
selectItems.add(staffNumItem);
selectItems.add(controlPolicyItem);
selectItems.add(descriptionItem);
String operateType = (String)params.get("operateType");
String operateType = (String) params.get("operateType");
if ("2".equals(operateType)) {
selectItems.forEach(item->item.setViewAttr(1));
selectItems.forEach(item -> {
item.setViewAttr(1);
item.setRules(null);
});
SearchConditionItem changeNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 3, "调整数量", "changeNum");
staffNumItem.setRules("required");
selectItems.add(changeNumItem);