From 2d65f236796d6177a44b87e3b08ae1521ffb5c82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Mon, 14 Oct 2024 10:35:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B9=E6=8D=AE=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=B6=E4=BB=B6=E5=8F=B7=E8=8E=B7=E5=8F=96=E5=85=B3?=
 =?UTF-8?q?=E9=94=AE=E9=9B=B6=E9=83=A8=E4=BB=B6=E5=90=8D=E7=A7=B0=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/part/controller/LawsPartTypeController.java |  4 ++--
 .../laws/part/service/ILawsPartTypeService.java      |  2 +-
 .../part/service/impl/LawsPartTypeServiceImpl.java   | 12 +++++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartTypeController.java b/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartTypeController.java
index b5a061b9..952312f0 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartTypeController.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartTypeController.java
@@ -200,8 +200,8 @@ public class LawsPartTypeController {
     @GetMapping(value = "/queryByPartNum")
     @ApiOperationSupport(order = 2)
     @Translation
-    public Result<LawsPartRelevance> queryByPartNum(LawsPartType lawsPartType) {
-        LawsPartRelevance result = lawsPartTypeService.queryByPartNum(lawsPartType.getPartNum());
+    public Result<List<LawsPartRelevance>> queryByPartNum(LawsPartType lawsPartType) {
+        List<LawsPartRelevance> result = lawsPartTypeService.queryByPartNum(lawsPartType.getPartNum());
         return Result.OK(result);
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/service/ILawsPartTypeService.java b/laws-modules/src/main/java/com/jero/modules/laws/part/service/ILawsPartTypeService.java
index 9af71cb9..4409786b 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/part/service/ILawsPartTypeService.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/part/service/ILawsPartTypeService.java
@@ -30,7 +30,7 @@ public interface ILawsPartTypeService extends IService<LawsPartType> {
 
     ModelAndView export(LawsPartType lawsPartType, HttpServletRequest request);
 
-    LawsPartRelevance queryByPartNum(String partNum);
+    List<LawsPartRelevance> queryByPartNum(String partNum);
 
     List<LawsPartType> queryByPartNumList(String partNum);
 }
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 52d82741..2488b5d6 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
@@ -20,6 +20,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.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -188,7 +189,7 @@ public class LawsPartTypeServiceImpl extends ServiceImpl<LawsPartTypeMapper, Law
     }
 
     @Override
-    public LawsPartRelevance queryByPartNum(String partNum) {
+    public List<LawsPartRelevance> queryByPartNum(String partNum) {
         LambdaQueryWrapper<LawsPartInfo> queryLawsPartInfo = new LambdaQueryWrapper<>();
         queryLawsPartInfo.eq(LawsPartInfo::getPartNum,partNum);
         LawsPartInfo lawsPartInfo = lawsPartInfoService.getOne(queryLawsPartInfo,false);
@@ -197,11 +198,12 @@ public class LawsPartTypeServiceImpl extends ServiceImpl<LawsPartTypeMapper, Law
         }
         QueryWrapper<LawsPartRelevance> queryLawsPartRelevance = new QueryWrapper<>();
         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);
+        queryLawsPartRelevance.orderByDesc("create_time");
+        List<LawsPartRelevance> lawsPartRelevanceList = lawsPartRelevanceService.list(queryLawsPartRelevance);
+        if(CollectionUtils.isEmpty(lawsPartRelevanceList)){
+            throw new JeroBootException(lawsPartInfo.getPartName() + "没有绑定数据，请联系标准管理员维护绑定关系。");
         }
-        return lawsPartRelevance;
+        return lawsPartRelevanceList;
     }
 
     @Override