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

BUG修复

This commit is contained in:
dxfeng 2022-08-22 18:56:27 +08:00
parent fb5eea214b
commit 07dabf46a0
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/organization/entity/job/po/JobPO.java
View File

@ -89,7 +89,7 @@ public class JobPO {
*/
private Integer showOrder;
private Integer gradeId;
private String gradeId;
private String levelId;

8
src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
View File

@ -474,11 +474,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
List<ExtendGroupPO> extendGroupPOS = JSONArray.parseArray(fieldTypeTreeParam.getData(), ExtendGroupPO.class);
List<Long> collect1 = extendGroupPOS.stream().map(ExtendGroupPO::getId).collect(Collectors.toList());
collect1.forEach(e -> {
if (collect.contains(e)) {
collect.remove(e);
}
});
collect1.forEach(collect::remove);
if (CollectionUtils.isNotEmpty(collect)) {
MapperProxyFactory.getProxy(ExtendGroupMapper.class).batchDelete(collect);
}
@ -525,7 +521,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
if (StringUtils.isNotEmpty(fieldids) && null != groupid) {
// 更新extendInfo表的extend_group_id
List<Long> ids = Arrays.asList(fieldids.split(",")).stream().map(item -> Long.parseLong(item)).collect(Collectors.toList());
List<Long> ids = Arrays.stream(fieldids.split(",")).map(Long::parseLong).collect(Collectors.toList());
getExtendInfoMapper().updateExtendGroupId(groupid, ids);
}

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

@ -306,7 +306,7 @@ public class JobServiceImpl extends Service implements JobService {
// 返回职等信息
JobPO jobById = getJobMapper().getJobById(id);
if (null != jobById) {
GradePO gradeByID = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByID(jobById.getGradeId());
GradePO gradeByID = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByID(Long.parseLong(jobById.getGradeId()));
if (null != gradeByID) {
apiDatas.put("levelIds", gradeByID.getLevelId());
}