From 07dabf46a0d633f87a0e3c81b534f40a9a5c4860 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 22 Aug 2022 18:56:27 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/organization/entity/job/po/JobPO.java | 2 +- .../service/impl/FieldDefinedServiceImpl.java | 8 ++------ .../engine/organization/service/impl/JobServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/com/engine/organization/entity/job/po/JobPO.java b/src/com/engine/organization/entity/job/po/JobPO.java index 43ebd116..3de9c18a 100644 --- a/src/com/engine/organization/entity/job/po/JobPO.java +++ b/src/com/engine/organization/entity/job/po/JobPO.java @@ -89,7 +89,7 @@ public class JobPO { */ private Integer showOrder; - private Integer gradeId; + private String gradeId; private String levelId; diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index f3719438..be751ea3 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -474,11 +474,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ List extendGroupPOS = JSONArray.parseArray(fieldTypeTreeParam.getData(), ExtendGroupPO.class); List 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 ids = Arrays.asList(fieldids.split(",")).stream().map(item -> Long.parseLong(item)).collect(Collectors.toList()); + List ids = Arrays.stream(fieldids.split(",")).map(Long::parseLong).collect(Collectors.toList()); getExtendInfoMapper().updateExtendGroupId(groupid, ids); } diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 064b2a3f..8429d866 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -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()); }