From da8cca4d320908b672f439369e65e9e6a95374e3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 07 三月 2022 09:46:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/partyBuilding_lyq' into hemenkou_dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideClassifyServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideClassifyServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideClassifyServiceImpl.java
index d5b3e1e..1f78b5c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideClassifyServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideClassifyServiceImpl.java
@@ -75,7 +75,9 @@
return R.fail("该办事指南分类不存在");
}
ComActWorkGuideClassifyDO checkCreditCode = comActWorkGuideClassifyDAO.selectOne(
- new QueryWrapper<ComActWorkGuideClassifyDO>().lambda().eq(ComActWorkGuideClassifyDO::getClassifyName, comActWorkGuideClassifyVO.getClassifyName()));
+ new QueryWrapper<ComActWorkGuideClassifyDO>().lambda()
+ .eq(ComActWorkGuideClassifyDO::getClassifyName, comActWorkGuideClassifyVO.getClassifyName())
+ .eq(ComActWorkGuideClassifyDO::getAreaCode, comActWorkGuideClassifyVO.getAreaCode()));
if (null != checkCreditCode && !comActWorkGuideClassifyDO.getId().equals(checkCreditCode.getId())) {
return R.fail("该办事指南分类已存在，办事指南分类名称重复");
}
@@ -88,7 +90,9 @@
} else {
// 新增
Integer count = comActWorkGuideClassifyDAO.selectCount(
- new QueryWrapper<ComActWorkGuideClassifyDO>().lambda().eq(ComActWorkGuideClassifyDO::getClassifyName, comActWorkGuideClassifyVO.getClassifyName()));
+ new QueryWrapper<ComActWorkGuideClassifyDO>().lambda()
+ .eq(ComActWorkGuideClassifyDO::getClassifyName, comActWorkGuideClassifyVO.getClassifyName())
+ .eq(ComActWorkGuideClassifyDO::getAreaCode, comActWorkGuideClassifyVO.getAreaCode()));
if (count > 0) {
return R.fail("该办事指南分类已存在，办事指南分类名称重复");
}
@@ -124,8 +128,8 @@
}
@Override
- public R getWorkGuideClassifyList() {
- List<ComActWorkGuideClassifyDO> comActWorkGuideClassifyDOS = comActWorkGuideClassifyDAO.selectList(null);
+ public R getWorkGuideClassifyList(String areaCode) {
+ List<ComActWorkGuideClassifyDO> comActWorkGuideClassifyDOS = comActWorkGuideClassifyDAO.selectList(new QueryWrapper<ComActWorkGuideClassifyDO>().lambda().eq(ComActWorkGuideClassifyDO::getAreaCode,areaCode));
List<ComActWorkGuideClassifyVO> comActWorkGuideClassifyVOList = new ArrayList<>();
if (comActWorkGuideClassifyDOS != null && comActWorkGuideClassifyDOS.size() > 0) {
comActWorkGuideClassifyDOS.forEach(comActWorkGuideClassifyDO -> {
--
Gitblit v1.7.1