From 27db9a7dfd0f98664c7e39376ee26e8890dc5ac0 Mon Sep 17 00:00:00 2001
From: zhangqinlin <983410zql>
Date: Mon, 13 Dec 2021 15:02:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=90=86=E4=BA=8B=E4=BC=9Abug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayCaseCouncilController.java  | 15 ++++++-
 .../PayCaseCouncilSubitemController.java      | 40 +++++++++----------
 2 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilController.java
index 01160a15..a734f11f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilController.java
@@ -1,6 +1,7 @@
 package com.jero.data.controller;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Optional;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -11,7 +12,9 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.data.entity.PayCaseCouncil;
+import com.jero.data.entity.PayCaseCouncilSubitem;
 import com.jero.data.service.IPayCaseCouncilService;
+import com.jero.data.service.IPayCaseCouncilSubitemService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -36,6 +39,8 @@ import io.swagger.annotations.ApiOperation;
 public class PayCaseCouncilController extends JeroController<PayCaseCouncil, IPayCaseCouncilService> {
 	@Autowired
 	private IPayCaseCouncilService payCaseCouncilService;
+	 @Autowired
+	 private IPayCaseCouncilSubitemService payCaseCouncilSubitemService;
 
 	 /**
 	  *   添加
@@ -66,7 +71,7 @@ public class PayCaseCouncilController extends JeroController<PayCaseCouncil, IPa
 	  *  编辑
 	  *
 	  */
-	 @RequiresPermissions("committee:edit")
+	 @RequiresPermissions("council:edit")
 	 @Transactional
 	 @AutoLog(value = "理事会-编辑")
 	 @ApiOperation(value="理事会-编辑", notes="理事会-编辑")
@@ -94,11 +99,17 @@ public class PayCaseCouncilController extends JeroController<PayCaseCouncil, IPa
 	 * @param id
 	 * @return
 	 */
+	@RequiresPermissions("council:delete")
 	@AutoLog(value = "理事会-通过id删除")
 	@ApiOperation(value="理事会-通过id删除", notes="理事会-通过id删除")
 	@GetMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		payCaseCouncilService.removeById(id);
+		LambdaQueryWrapper<PayCaseCouncilSubitem> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(PayCaseCouncilSubitem::getCouncilId,id);
+		List<PayCaseCouncilSubitem> payCaseCommitteeSubitems = payCaseCouncilSubitemService.list(queryWrapper);
+		if(payCaseCommitteeSubitems.size()>0){
+			return Result.error("理事会下级仍有数据，不可删除!");
+		}payCaseCouncilSubitemService.removeById(id);
 		return Result.OK("删除成功!");
 	}
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java
index 6450b22b..40352e4e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java
@@ -101,7 +101,7 @@ public class PayCaseCouncilSubitemController extends JeroController<PayCaseCounc
 	 /**
 	  *   添加
 	  */
-//	 @RequiresPermissions("committee:addMember")
+	 @RequiresPermissions("council:addMember")
 	 @Transactional
 	 @AutoLog(value = "理事会成员表-添加")
 	 @ApiOperation(value="理事会成员表-添加", notes="理事会成员表-添加")
@@ -112,7 +112,7 @@ public class PayCaseCouncilSubitemController extends JeroController<PayCaseCounc
 //		新增时校验重复ne
 		 LambdaQueryWrapper<PayCaseCouncilSubitem> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		 lambdaQueryWrapper.eq(PayCaseCouncilSubitem::getContactsId, payCaseCouncilSubitem.getContactsId());
-		 lambdaQueryWrapper.ne(PayCaseCouncilSubitem::getCouncilId, payCaseCouncilSubitem.getCouncilId());
+		 lambdaQueryWrapper.eq(PayCaseCouncilSubitem::getCouncilId, payCaseCouncilSubitem.getCouncilId());
 		 int count = payCaseCouncilSubitemService.count(lambdaQueryWrapper);
 		 if (count > 0) {
 			 return Result.error("联系人重复，请重新选择");
@@ -129,7 +129,7 @@ public class PayCaseCouncilSubitemController extends JeroController<PayCaseCounc
 	 * @param id
 	 * @return
 	 */
-	@RequiresPermissions("council:delete")
+	@RequiresPermissions("council:member:delete")
 	@AutoLog(value = "理事会成员-通过id删除")
 	@ApiOperation(value="理事会成员-通过id删除", notes="理事会成员-通过id删除")
 	@GetMapping(value = "/delete")
@@ -152,23 +152,23 @@ public class PayCaseCouncilSubitemController extends JeroController<PayCaseCounc
 //		this.payCaseCouncilSubitemService.removeByIds(Arrays.asList(ids.split(",")));
 //		return Result.OK("批量删除成功!");
 //	}
-
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "理事会成员-通过id查询")
-	@ApiOperation(value="理事会成员-通过id查询", notes="理事会成员-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
-		PayCaseCouncilSubitem payCaseCouncilSubitem = payCaseCouncilSubitemService.getById(id);
-		if(payCaseCouncilSubitem==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(payCaseCouncilSubitem);
-	}
+//
+//	/**
+//	 * 通过id查询
+//	 *
+//	 * @param id
+//	 * @return
+//	 */
+//	@AutoLog(value = "理事会成员-通过id查询")
+//	@ApiOperation(value="理事会成员-通过id查询", notes="理事会成员-通过id查询")
+//	@GetMapping(value = "/queryById")
+//	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+//		PayCaseCouncilSubitem payCaseCouncilSubitem = payCaseCouncilSubitemService.getById(id);
+//		if(payCaseCouncilSubitem==null) {
+//			return Result.error("未找到对应数据");
+//		}
+//		return Result.OK(payCaseCouncilSubitem);
+//	}
 
 
 	 /**