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

人员信息分类

This commit is contained in:
dxfeng 2022-08-29 15:39:35 +08:00
parent cfc78875c6
commit 5dc920e364
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -418,7 +418,8 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
OrganizationAssert.notBlank(copyParam.getCompany(), "请指定需要复制的公司/分部");
int insertCount = 0;
List<Long> idList = Arrays.stream(copyParam.getIds().split(",")).map(Long::parseLong).collect(Collectors.toList());
int maxShowOrder = getDepartmentMapper().getMaxShowOrder();
Integer maxShowOrder = getDepartmentMapper().getMaxShowOrder();
maxShowOrder = null == maxShowOrder ? 0 : maxShowOrder;
for (int i = 0; i < idList.size(); i++) {
DepartmentPO deptById = getDepartmentMapper().getDeptById(idList.get(i));
deptById.setDeptName(deptById.getDeptName() + "[复制]");

3
src/com/engine/organization/service/impl/JobServiceImpl.java
View File

@ -387,7 +387,8 @@ public class JobServiceImpl extends Service implements JobService {
OrganizationAssert.notBlank(department, "请指定需要复制的部门");
int insertCount = 0;
List<Long> idList = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList());
int orderNum = getJobMapper().getMaxShowOrder();
Integer orderNum = getJobMapper().getMaxShowOrder();
orderNum = null == orderNum ? 0 : orderNum;
for (Long id : idList) {
orderNum++;
JobPO jobById = getJobMapper().getJobById(id);

2
src/com/engine/organization/service/impl/ResourceBasicInfoServiceImpl.java
View File

@ -163,7 +163,7 @@ public class ResourceBasicInfoServiceImpl extends Service implements ResourceBas
fName.setRules("required|string");
SearchConditionItem fMemo = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "说明", "fmemo");
if (StringUtils.isNotBlank(id)) {
if (!"-1".equals(id) && StringUtils.isNotBlank(id)) {
ResourceItemClassPO resourceItemClassPO = getResourceBasicInfoMapper().getResourceItemClassByFid(Integer.parseInt(id));
OrganizationAssert.notNull(resourceItemClassPO, "选择的数据不存在");
fNo.setValue(resourceItemClassPO.getFno());