1.花名册列定制 系统字段受启用限制 2.编制冻结接口强控校验修改
This commit is contained in:
parent
104da41f28
commit
eceb6ea209
|
|
@ -81,13 +81,14 @@ public class FunctionOutStaffServiceImpl {
|
||||||
OrganizationAssert.isFalse(staffPO.getFreezeNum() == 0, SystemEnv.getHtmlLabelName(547949,user.getLanguage()));
|
OrganizationAssert.isFalse(staffPO.getFreezeNum() == 0, SystemEnv.getHtmlLabelName(547949,user.getLanguage()));
|
||||||
}
|
}
|
||||||
|
|
||||||
List<Integer> numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum(),staffPO.getPermanentNum());
|
List<Integer> numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum());
|
||||||
//1.增加冻结数 (num为负数时为减少冻结数)
|
//1.增加冻结数 (num为负数时为减少冻结数)
|
||||||
Integer sum = numberF.stream()
|
Integer sum = numberF.stream()
|
||||||
.mapToInt(Integer::intValue)
|
.mapToInt(Integer::intValue)
|
||||||
.sum();
|
.sum();
|
||||||
|
Integer sums = sum + staffPO.getPermanentNum();
|
||||||
if (staffPO.getControlPolicy().equals(HARDCONTROLLER)) {
|
if (staffPO.getControlPolicy().equals(HARDCONTROLLER)) {
|
||||||
OrganizationAssert.isFalse(sum.compareTo(staffPO.getStaffNum()) > 0, SystemEnv.getHtmlLabelName(547469,user.getLanguage()));
|
OrganizationAssert.isFalse(sums.compareTo(staffPO.getStaffNum()) > 0, SystemEnv.getHtmlLabelName(547469,user.getLanguage()));
|
||||||
}
|
}
|
||||||
staffPO.setFreezeNum(sum);
|
staffPO.setFreezeNum(sum);
|
||||||
buildStaffPO(staffPO);
|
buildStaffPO(staffPO);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue