BUG修复

pull/69/MERGE^2
dxfeng 3 years ago
parent 9877308b84
commit ec4e92e113

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

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

Loading…
Cancel
Save