From 90de589a0964981f05b1571e441110130f35f4b8 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期五, 18 二月 2022 11:01:59 +0800
Subject: [PATCH] Merge branch 'volunteer_lyq' into 'dev'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoClassifyServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoClassifyServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoClassifyServiceImpl.java
index 1e45b02..c54b77f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoClassifyServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoClassifyServiceImpl.java
@@ -38,7 +38,7 @@
public R addPhotoClassify(AddEasyPhotoClassifyDTO addPhotoClassify) {
ComActEasyPhotoClassifyDO photoClassifyDO =
this.baseMapper.selectOne(new QueryWrapper<ComActEasyPhotoClassifyDO>().lambda()
- .eq(ComActEasyPhotoClassifyDO::getName, addPhotoClassify.getName()));
+ .eq(ComActEasyPhotoClassifyDO::getName, addPhotoClassify.getName()).eq(ComActEasyPhotoClassifyDO::getAreaCode,addPhotoClassify.getAreaCode()));
if (photoClassifyDO != null) {
return R.fail("该随手拍分类已存在，请勿重复添加");
}
@@ -112,8 +112,8 @@
* @return 随手拍分类列表
*/
@Override
- public R listPhotoClassify() {
- return R.ok(this.baseMapper.getPhotoClassifyList());
+ public R listPhotoClassify(String areaCode) {
+ return R.ok(this.baseMapper.getPhotoClassifyList(areaCode));
}
/**
--
Gitblit v1.7.1