From 8133ea0c4d3058239acf0a7ecdadf209d53c2f60 Mon Sep 17 00:00:00 2001 From: zhangqinlin <983410zql> Date: Mon, 13 Dec 2021 14:38:24 +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 --- .../PayCaseCommitteeController.java | 6 ++-- .../controller/PayCaseCouncilController.java | 10 +++--- .../PayCaseCouncilSubitemController.java | 36 ++++++++++--------- 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java index acd3a83d..239add62 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java @@ -164,7 +164,7 @@ public class PayCaseCommitteeController extends JeroController queryWrapper2 = new LambdaQueryWrapper<>(); queryWrapper2.eq(PayCaseCommittee::getAbbreviation,payCaseCommitteeDTO.getAbbreviation()); PayCaseCommittee one2 = payCaseCommitteeService.getOne(queryWrapper2,false); - if (ObjectUtils.isEmpty(one2)) { + if (!ObjectUtils.isEmpty(one2)) { return Result.error("分标简称已存在"); } PayCaseCommittee payCaseCommittee = new PayCaseCommittee(); @@ -187,14 +187,16 @@ public class PayCaseCommitteeController extends JeroController edit( @Valid @RequestBody PayCaseCommitteeUpdateDTO payCaseCommitteeUpdateDTO) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(PayCaseCommittee::getName,payCaseCommitteeUpdateDTO.getName()); + queryWrapper.ne(PayCaseCommittee::getId,payCaseCommitteeUpdateDTO.getId()); PayCaseCommittee one = payCaseCommitteeService.getOne(queryWrapper,false); if (!ObjectUtils.isEmpty(one)) { return Result.error("分标委名已存在"); } LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); queryWrapper2.eq(PayCaseCommittee::getAbbreviation,payCaseCommitteeUpdateDTO.getAbbreviation()); + queryWrapper2.ne(PayCaseCommittee::getId,payCaseCommitteeUpdateDTO.getId()); PayCaseCommittee one2 = payCaseCommitteeService.getOne(queryWrapper2,false); - if (ObjectUtils.isEmpty(one2)) { + if (!ObjectUtils.isEmpty(one2)) { return Result.error("分标简称已存在"); } PayCaseCommittee payCaseCommittee = new PayCaseCommittee(); 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 640b5d87..01160a15 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 @@ -14,6 +14,7 @@ import com.jero.data.entity.PayCaseCouncil; import com.jero.data.service.IPayCaseCouncilService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -42,7 +43,7 @@ public class PayCaseCouncilController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(PayCaseCouncil::getName,payCaseCouncil.getName()); + queryWrapper.ne(PayCaseCouncil::getId,payCaseCouncil.getId()); PayCaseCouncil one = payCaseCouncilService.getOne(queryWrapper,false); if (!ObjectUtils.isEmpty(one)) { - return Result.error("分标委名已存在"); + return Result.error("理事会名已存在"); } PayCaseCouncil payCaseCouncil1 = new PayCaseCouncil(); BeanUtils.copyProperties(payCaseCouncil, payCaseCouncil1); 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 e7fc1140..6450b22b 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 @@ -56,7 +56,7 @@ public class PayCaseCouncilSubitemController extends JeroController find(@RequestParam(name="contactsName",required =false) String contactsName, @@ -109,10 +109,10 @@ public class PayCaseCouncilSubitemController extends JeroController add(@Valid @RequestBody PayCaseCouncilSubitem payCaseCouncilSubitem) { PayCaseCouncilSubitem payCaseCouncilSubitem1 = new PayCaseCouncilSubitem(); BeanUtils.copyProperties(payCaseCouncilSubitem,payCaseCouncilSubitem1); -// 新增时校验重复 +// 新增时校验重复ne LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(PayCaseCouncilSubitem::getContactsId, payCaseCouncilSubitem.getContactsId()); - lambdaQueryWrapper.eq(PayCaseCouncilSubitem::getCouncilId, payCaseCouncilSubitem.getCouncilId()); + lambdaQueryWrapper.ne(PayCaseCouncilSubitem::getCouncilId, payCaseCouncilSubitem.getCouncilId()); int count = payCaseCouncilSubitemService.count(lambdaQueryWrapper); if (count > 0) { return Result.error("联系人重复，请重新选择"); @@ -129,6 +129,7 @@ public class PayCaseCouncilSubitemController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.payCaseCouncilSubitemService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } +// /** +// * 批量删除 +// * +// * @param ids +// * @return +// */ +// @RequiresPermissions("council:batchDel") +// @AutoLog(value = "理事会成员-批量删除") +// @ApiOperation(value="理事会成员-批量删除", notes="理事会成员-批量删除") +// @GetMapping(value = "/deleteBatch") +// public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { +// this.payCaseCouncilSubitemService.removeByIds(Arrays.asList(ids.split(","))); +// return Result.OK("批量删除成功!"); +// } /** * 通过id查询 @@ -175,7 +177,7 @@ public class PayCaseCouncilSubitemController extends JeroController