From c7e3c97339581c02289e8f1df9342b89cc380b53 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 23 Sep 2021 15:17:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87=E5=87=86--?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B8=85=E5=8D=95=E4=B8=8B=E6=8C=82=E7=9D=80?=
 =?UTF-8?q?=E6=A0=87=E5=87=86A=EF=BC=8C=E5=9C=A8=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=BA=93=E9=87=8C=E5=88=A0=E9=99=A4=E6=A0=87=E5=87=86A?=
 =?UTF-8?q?=E7=9A=84=E8=AF=9D=EF=BC=8C=E5=8A=A0=E4=B8=AA=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=20=E4=B8=8D=E8=AE=A9=E5=88=A0=E8=BF=99=E4=B8=AA=E6=A0=87?=
 =?UTF-8?q?=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarStandardsInfoController.java           |  5 ++++-
 .../impl/SarStandardsInfoServiceImpl.java     | 21 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
index 06bf3717..18fc22cd 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
@@ -218,7 +218,10 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
         int result = sarStandardsInfoEOService.deleteSarStandards(ids);
         if (result > 0) {
             return Result.success("0", "删除成功", result);
-        } else {
+        }else if(result == -1) {
+            return Result.success("-1","所选的标准下挂有标准，无法删除");
+        }
+        else {
             return Result.error("删除失败");
         }
     }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index 5b3dc546..e9af7d73 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -15,6 +15,8 @@ import com.adc.da.search.entity.StandLawsEO;
 import com.adc.da.search.service.StandLawsSearchService;
 import com.adc.da.slrs.otConvertMq.dao.OtConvertMqDao;
 import com.adc.da.slrs.otConvertMq.entity.OtConvertMq;
+import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarLawsAttrDetailedList;
+import com.adc.da.slrs.sarLawsAttrDetailedList.service.impl.SarLawsAttrDetailedListServiceImpl;
 import com.adc.da.slrs.sarLawsInfo.entity.SarLawsInfo;
 import com.adc.da.slrs.sarLawsInfo.page.SarLawsInfoEOPage;
 import com.adc.da.slrs.sarLawsInfo.page.SarLawsItemsEOPage;
@@ -1285,13 +1287,32 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     }
 
 
+    @Autowired
+    SarLawsAttrDetailedListServiceImpl detailedListService;
+
     public int deleteSarStandards(String ids) {
+        QueryWrapper<SarLawsAttrDetailedList> detailedListQueryWrapper = new QueryWrapper<>();
+
+
         String[] idArr = ids.split(",");
         SarStandardsInfo sarStandardsInfoEO = new SarStandardsInfo();
         sarStandardsInfoEO.setValidFlag("1");
         sarStandardsInfoEO.setModifyTime(new Date());
         int countResult = 0;
+        //如果清单下挂着标准A，在标准库里删除标准A的话，加个验证 不让删这个标准
+        for (String id : idArr){
+            detailedListQueryWrapper.eq("stand_id",id);
+
+            int count = detailedListService.count(detailedListQueryWrapper);
+            if (count>0){
+                countResult = -1;
+                return countResult;
+            }
+
+        }
+
         for (String id : idArr) {
+
             countResult++;
             //查询删除的标准信息（为删除代替关系）
             SarStandardsInfo getDelStandInfoList = dao.selectById(id);