diff --git a/src/com/engine/organization/service/impl/GroupServiceImpl.java b/src/com/engine/organization/service/impl/GroupServiceImpl.java index 65e8b22e..0efe0a73 100644 --- a/src/com/engine/organization/service/impl/GroupServiceImpl.java +++ b/src/com/engine/organization/service/impl/GroupServiceImpl.java @@ -29,7 +29,6 @@ public class GroupServiceImpl extends Service implements GroupService { @Override public Map getGroupFormField(Map params) { - HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index ebbe9aa2..92fd35a5 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -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);