diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 5abfae37..ad9992d9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -2628,7 +2628,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl list = sarMenuStandardService.list(wrapper); if (list.size() > 0) { - sarBussStandAttrInfo.setTxlbbuss(list.get(0).getId()); + sarBussStandAttrInfo.setTxlbbuss(list.get(0).getMenuName()); }else { return Result.error("第"+ count +"行请输入正确的标准体系"); } @@ -4930,13 +4930,20 @@ public class SarBussionessStandServiceImpl extends ServiceImpl attrInfoMap = JSON.parseObject(sarStandAttrEOStr1, Map.class); - if (StringUtils.isNotBlank(attrInfoMap.get("TXLBBUSS"))) { - SarBussStandMenu sarBussStandMenuEO = new SarBussStandMenu(); - sarBussStandMenuEO.setBussStandId(sarBussionessStandEO.getId()); - sarBussStandMenuEO.setMenuId(attrInfoMap.get("TXLBBUSS")); - sarBussStandMenuEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue()); - sarBussStandMenuEO.setId(UUIDUtils.randomUUID20()); - sarBussStandMenuEODao.insert(sarBussStandMenuEO); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SarMenuStandard::getMenuName, attrInfoMap.get("TXLBBUSS")); + queryWrapper.eq(SarMenuStandard::getValidFlag, "0"); + queryWrapper.eq(SarMenuStandard::getDicId, "9m4qqqaansxmox5e82zm"); + List list = sarMenuStandardService.list(queryWrapper); + if (list.size() > 0) { + if (StringUtils.isNotBlank(attrInfoMap.get("TXLBBUSS"))) { + SarBussStandMenu sarBussStandMenuEO = new SarBussStandMenu(); + sarBussStandMenuEO.setBussStandId(sarBussionessStandEO.getId()); + sarBussStandMenuEO.setMenuId(list.get(0).getId()); + sarBussStandMenuEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue()); + sarBussStandMenuEO.setId(UUIDUtils.randomUUID20()); + sarBussStandMenuEODao.insert(sarBussStandMenuEO); + } } } if (insertresult >= 1) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java index cc7a758e..2c86309e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java @@ -131,7 +131,11 @@ public class SarLawsDetailedListController extends BaseController