From 0d9cbe7ff53c936dd41ccecd6ef5011a773c3ac7 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 23 Aug 2022 17:43:09 +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 --- .../service/impl/FieldDefinedServiceImpl.java | 30 ++++++++++++++----- .../service/impl/JobServiceImpl.java | 4 +-- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index be751ea3..d44ccf90 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -59,7 +59,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ @Override public List getTree(ModuleTypeEnum moduleTypeEnum) { Integer extendType = moduleTypeEnum.getValue(); - List extendGroupPOS = MapperProxyFactory.getProxy(ExtendGroupMapper.class).listByType(extendType,null); + List extendGroupPOS = MapperProxyFactory.getProxy(ExtendGroupMapper.class).listByType(extendType, null); return ExtendGroupBO.buildTypeTree(extendGroupPOS); } @@ -69,7 +69,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ Map datas = new HashMap<>(); Long groupId = Long.parseLong(groupType); String tableName = ExtendGroupBO.getTableNameByGroupPO(getExtendGroupMapper().getGroupById(groupId)); - List extendTitleList = getExtendTitleMapper().getTitlesByGroupID(groupId,null); + List extendTitleList = getExtendTitleMapper().getTitlesByGroupID(groupId, null); List> tabs = new ArrayList<>(); int idx = 1; for (ExtendTitlePO extendTitle : extendTitleList) { @@ -135,7 +135,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ Map datas = new HashMap<>(); Long groupType = param.getGroupType(); Set lsDelGroupId = new HashSet<>(); - List extendTitleList = getExtendTitleMapper().getTitlesByGroupID(groupType,null); + List extendTitleList = getExtendTitleMapper().getTitlesByGroupID(groupType, null); extendTitleList.forEach(item -> lsDelGroupId.add(item.getId())); String data = param.getData(); JSONObject jsonObject = JSON.parseObject(data); @@ -178,7 +178,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ public Map saveTitle(ExtendTitleSaveParam param) { Map datas = new HashMap<>(); - List titlesByGroupID = getExtendTitleMapper().getTitlesByGroupID(param.getGroupType(),null); + List titlesByGroupID = getExtendTitleMapper().getTitlesByGroupID(param.getGroupType(), null); ExtendTitlePO extendTitlePO = titlesByGroupID.stream().max(Comparator.comparing(ExtendTitlePO::getShowOrder)).orElse(ExtendTitlePO.builder().showOrder(1).build()); Set ids = titlesByGroupID.stream().map(ExtendTitlePO::getId).collect(Collectors.toSet()); ExtendTitlePO extendTitle = new ExtendTitlePO(); @@ -201,7 +201,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ @Override public void changeTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { if (fieldTypeTreeParam.getId() == null) { - List extendGroupPOList = MapperProxyFactory.getProxy(ExtendGroupMapper.class).listByType(moduleTypeEnum.getValue(),null); + List extendGroupPOList = MapperProxyFactory.getProxy(ExtendGroupMapper.class).listByType(moduleTypeEnum.getValue(), null); ExtendGroupPO extendGroup = extendGroupPOList.stream().max(Comparator.comparing(ExtendGroupPO::getShowOrder)).get(); ExtendGroupPO extendGroupPO = buildExtendGroupType(moduleTypeEnum, fieldTypeTreeParam, extendGroup.getShowOrder()); MapperProxyFactory.getProxy(ExtendGroupMapper.class).insertIgnoreNull(extendGroupPO); @@ -217,7 +217,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ @Override public int deleteTitle(ExtendTitleSaveParam param) { getExtendTitleMapper().deleteExtendTitleByIds(DeleteParam.builder().ids(param.getId().toString()).build().getIds()); - List titlesByGroupID = getExtendTitleMapper().getTitlesByGroupID(param.getGroupType(),null); + List titlesByGroupID = getExtendTitleMapper().getTitlesByGroupID(param.getGroupType(), null); if (CollectionUtils.isEmpty(titlesByGroupID)) { // 删除整个分组 @@ -457,8 +457,22 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ public void deleteTree(Long id) { //明细表删除字段信息、删除表结构 ExtendGroupPO extendGroupPO = getExtendGroupMapper().getGroupById(id); - MapperProxyFactory.getProxy(ExtendGroupMapper.class).delete(id); List extendInfoList = getExtendInfoMapper().listFields(extendGroupPO.getExtendType().toString(), extendGroupPO.getId().toString(), ExtendGroupBO.getTableNameByGroupPO(extendGroupPO), "", ""); + String msg = ""; + for (ExtendInfoPO extendInfoPO : extendInfoList) { + // 判断字段是否使用 + boolean isUsed = ExtendInfoBO.fieldIsUsed(extendInfoPO.getTableName(), extendInfoPO.getFieldName()); + if (isUsed) { + msg = extendInfoPO.getFieldNameDesc() + "字段已被使用，不可删除"; + break; + } + if (extendInfoPO.getIsSystemDefault() == 0) { + msg = extendInfoPO.getFieldNameDesc() + "字段为系统必须字段，不可删除"; + break; + } + } + OrganizationAssert.isBlank(msg, msg); + MapperProxyFactory.getProxy(ExtendGroupMapper.class).delete(id); List ids = extendInfoList.stream().map(ExtendInfoPO::getId).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(ids)) { // 删除数据 @@ -469,7 +483,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ @Override public void saveTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { Set collect = MapperProxyFactory.getProxy(ExtendGroupMapper.class) - .listGroupByPid(fieldTypeTreeParam.getParentId(),null).stream().map(ExtendGroupPO::getId).collect(Collectors.toSet()); + .listGroupByPid(fieldTypeTreeParam.getParentId(), null).stream().map(ExtendGroupPO::getId).collect(Collectors.toSet()); Integer extendType = moduleTypeEnum.getValue(); List extendGroupPOS = JSONArray.parseArray(fieldTypeTreeParam.getData(), ExtendGroupPO.class); diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 8429d866..0ece142b 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -250,7 +250,7 @@ public class JobServiceImpl extends Service implements JobService { HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); - List extendTitles = getExtendTitleMapper().getTitlesByGroupID(GROUP_ID,"1"); + List extendTitles = getExtendTitleMapper().getTitlesByGroupID(GROUP_ID, "1"); if (CollectionUtils.isNotEmpty(extendTitles)) { for (ExtendTitlePO extendTitle : extendTitles) { List items = getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_JOB, 2, extendTitle.getId().toString(), "job_no", RuleCodeType.JOBTITLES.getValue(), "scheme_id", "parent_comp"); @@ -305,7 +305,7 @@ public class JobServiceImpl extends Service implements JobService { apiDatas.put("result", resultMap); // 返回职等信息 JobPO jobById = getJobMapper().getJobById(id); - if (null != jobById) { + if (null != jobById && StringUtils.isNotBlank(jobById.getGradeId())) { GradePO gradeByID = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByID(Long.parseLong(jobById.getGradeId())); if (null != gradeByID) { apiDatas.put("levelIds", gradeByID.getLevelId());