diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartRelevanceController.java b/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartRelevanceController.java index 105e6141..8dcbcf4e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartRelevanceController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartRelevanceController.java @@ -123,7 +123,7 @@ public class LawsPartRelevanceController { @ApiOperationSupport(order = 5) @PostMapping(value = "/add") @RequiresPermissions("keyPartBindingManage:add") - public Result add(@Validated @RequestBody LawsPartRelevance lawsPartRelevance) { + public Result add(@RequestBody LawsPartRelevance lawsPartRelevance) { lawsPartRelevanceService.add(lawsPartRelevance); return Result.OK(ResultCommon.OK); } @@ -139,7 +139,7 @@ public class LawsPartRelevanceController { @ApiOperationSupport(order = 6) @PostMapping(value = "/edit") @RequiresPermissions("keyPartBindingManage:import") - public Result edit(@Validated @RequestBody LawsPartRelevance lawsPartRelevance) { + public Result edit(@RequestBody LawsPartRelevance lawsPartRelevance) { this.lawsPartRelevanceService.edit(lawsPartRelevance); return Result.OK(ResultCommon.OK); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartRelevanceServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartRelevanceServiceImpl.java index 87fc49cf..9f6ad6e5 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartRelevanceServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartRelevanceServiceImpl.java @@ -100,7 +100,12 @@ public class LawsPartRelevanceServiceImpl extends ServiceImpl query = new LambdaQueryWrapper<>(); + query.eq(LawsPartPmmPartitionInfo::getRegPartNameCn,lawsPartRelevance.getRegPartNameCn()); + List listLawsPartPmmPartitionInfo = lawsPartPmmPartitionInfoService.list(query); + if(CollectionUtils.isEmpty(listLawsPartPmmPartitionInfo)){ + throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND); + } // 需要做名称+功能系统码唯一性校验 LambdaQueryWrapper queryLawsPartRelevance = new LambdaQueryWrapper<>(); queryLawsPartRelevance.eq(LawsPartRelevance::getRegPartNameCn,lawsPartRelevance.getRegPartNameCn()); @@ -110,6 +115,8 @@ public class LawsPartRelevanceServiceImpl extends ServiceImpl fndGpcList = listLawsPartPmmPartitionInfo.stream().map(LawsPartPmmPartitionInfo::getFndGpc).collect(Collectors.toList()); + lawsPartRelevance.setFndGpc(String.join(",",fndGpcList)); save(lawsPartRelevance); } @@ -131,6 +138,12 @@ public class LawsPartRelevanceServiceImpl extends ServiceImpl query = new LambdaQueryWrapper<>(); + query.eq(LawsPartPmmPartitionInfo::getRegPartNameCn,lawsPartRelevance.getRegPartNameCn()); + List listLawsPartPmmPartitionInfo = lawsPartPmmPartitionInfoService.list(query); + if(CollectionUtils.isEmpty(listLawsPartPmmPartitionInfo)){ + throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND); + } // 需要做名称+功能系统码唯一性校验 LambdaQueryWrapper queryLawsPartRelevance = new LambdaQueryWrapper<>(); queryLawsPartRelevance.eq(LawsPartRelevance::getRegPartNameCn,lawsPartRelevance.getRegPartNameCn()); @@ -141,6 +154,8 @@ public class LawsPartRelevanceServiceImpl extends ServiceImpl fndGpcList = listLawsPartPmmPartitionInfo.stream().map(LawsPartPmmPartitionInfo::getFndGpc).collect(Collectors.toList()); + lawsPartRelevance.setFndGpc(String.join(",",fndGpcList)); updateById(lawsPartRelevance); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartTypeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartTypeServiceImpl.java index eeb07eb4..054a6515 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartTypeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartTypeServiceImpl.java @@ -21,6 +21,7 @@ import com.jero.modules.laws.part.service.ILawsPartInfoService; import com.jero.modules.laws.part.service.ILawsPartRelevanceService; import com.jero.modules.laws.part.service.ILawsPartTypeService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -196,7 +197,7 @@ public class LawsPartTypeServiceImpl extends ServiceImpl queryLawsPartRelevance = new QueryWrapper<>(); - queryLawsPartRelevance.gt("FIND_IN_SET(fnd_gpc,'" + lawsPartInfo.getFndGpc() + "')", 0); + queryLawsPartRelevance.gt("FIND_IN_SET('" + lawsPartInfo.getFndGpc() + "',fnd_gpc)", 0); LawsPartRelevance lawsPartRelevance = lawsPartRelevanceService.getOne(queryLawsPartRelevance,false); if(Objects.isNull(lawsPartRelevance)){ throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND); @@ -206,6 +207,9 @@ public class LawsPartTypeServiceImpl extends ServiceImpl queryByPartNumList(String partNum) { + if(StringUtils.isEmpty(partNum)){ + throw new JeroBootException(ResultCommon.PARAMETER_NOT_RECOGNIZED); + } LambdaQueryWrapper queryLawsPartType = new LambdaQueryWrapper<>(); queryLawsPartType.select(LawsPartType::getPartRelevanceType); queryLawsPartType.eq(LawsPartType::getPartNum,partNum);