getDeptList(DeptListReqVO reqVO);
+ /**
+ *
+ * findParentDept
+ * Description:查询根节点
+ * @author: zenghuapei
+ * @date: 2023/5/23 09:40
+ * @param tenantId:
+ * @return
+ *
+ */
+ DeptDO findParentDept(Long tenantId);
+
/**
* 获得所有子部门，从缓存中
*
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
index 89f98f8b9..0fb718f13 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptCreateReqVO;
import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptUpdateReqVO;
@@ -13,6 +14,7 @@ import cn.iocoder.yudao.module.system.dal.mysql.dept.DeptMapper;
import cn.iocoder.yudao.module.system.enums.dept.DeptIdEnum;
import cn.iocoder.yudao.module.system.mq.producer.dept.DeptProducer;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.Multimap;
@@ -152,6 +154,26 @@ public class DeptServiceImpl implements DeptService {
return deptMapper.selectList(reqVO);
}
+
+ /**
+ *
+ * findParentDept
+ * Description:查询根节点
+ * @author: zenghuapei
+ * @date: 2023/5/23 09:40
+ * @param tenantId :
+ * @return
+ *
+ */
+ @Override
+ public DeptDO findParentDept(Long tenantId) {
+ List deptDOs = deptMapper.selectList(Wrappers.lambdaQuery(DeptDO.class).eq(DeptDO::getParentId,DeptIdEnum.ROOT.getId()).eq(DeptDO::getTenantId,tenantId));
+ if(deptDOs!=null && deptDOs.size() > 0){
+ return deptDOs.get(0);
+ }
+ return null;
+ }
+
@Override
public List getDeptListByParentIdFromCache(Long parentId, boolean recursive) {
if (parentId == null) {
From 0e3b3bf667a1da8e24998ddf415540939fe7b13c Mon Sep 17 00:00:00 2001
From: perry <292303709@qq.com>
Date: Tue, 23 May 2023 10:34:09 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../module/member/controller/app/user/AppUserController.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java
index 9121908f6..ba91db9ae 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java
@@ -116,7 +116,7 @@ public class AppUserController {
List list = new ArrayList<>();
UserSpreadBannerVO userSpreadBannerVO = new UserSpreadBannerVO();
userSpreadBannerVO.setId(1);
- userSpreadBannerVO.setPic("http://192.168.1.147:48080/admin-api/infra/file/4/get/431efea27162d536d35f7b3c0b844ede98a6ba58f4fd72ac7181e7ee5ebae77a.jpg");
+ userSpreadBannerVO.setPic("http://image.cyywl.top/431efea27162d536d35f7b3c0b844ede98a6ba58f4fd72ac7181e7ee5ebae77a.jpg");
userSpreadBannerVO.setTitle("推广背景图");
list.add(userSpreadBannerVO);
return CommonResult.success(list);
From bbb204191a909811a3fe84cd34ddd519e7347feb Mon Sep 17 00:00:00 2001
From: perry <292303709@qq.com>
Date: Tue, 23 May 2023 11:00:24 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=85=AC=E4=BC=97?=
=?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yudao-server/src/main/resources/application-prod.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/yudao-server/src/main/resources/application-prod.yaml b/yudao-server/src/main/resources/application-prod.yaml
index fef802529..9e5ffdb73 100644
--- a/yudao-server/src/main/resources/application-prod.yaml
+++ b/yudao-server/src/main/resources/application-prod.yaml
@@ -151,8 +151,8 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta
database: 16 # 数据库索引
password: cyywl123.. # 密码，建议生产环境开启
# 公众号配置(必填)
- app-id: wx041349c6f39b268b
- secret: 5abee519483bc9f8cb37ce280e814bd0
+ app-id: wx7e503d9cded34c07
+ secret: 31883ca14e2cbac8610d30f8f945ee47
# 存储配置，解决 AccessToken 的跨节点的共享
config-storage:
type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取
From 032074a119caf318b5736302cb65a2b02ff977ba Mon Sep 17 00:00:00 2001
From: perry <292303709@qq.com>
Date: Tue, 23 May 2023 11:05:48 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yudao-server/src/main/resources/application-prod.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/yudao-server/src/main/resources/application-prod.yaml b/yudao-server/src/main/resources/application-prod.yaml
index 9e5ffdb73..5bbf31b45 100644
--- a/yudao-server/src/main/resources/application-prod.yaml
+++ b/yudao-server/src/main/resources/application-prod.yaml
@@ -168,7 +168,7 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta
pay:
one:
enabled: true
- app-id: wxb1826c88da21d81e
+ app-id: wx7e503d9cded34c07
mch-id: 1641993417
mch-key: qdn2I7Cmx4JeiKOt2CDjiu6UHgLTsOsM
apiv3-key: cyywl666666cyywl888888cyywl66666
From 2adf4d610a872192ff4fe0be1a2e430052e7cb5c Mon Sep 17 00:00:00 2001
From: perry <292303709@qq.com>
Date: Tue, 23 May 2023 11:12:28 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yudao-server/src/main/resources/application-prod.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/yudao-server/src/main/resources/application-prod.yaml b/yudao-server/src/main/resources/application-prod.yaml
index 5bbf31b45..6d7f99628 100644
--- a/yudao-server/src/main/resources/application-prod.yaml
+++ b/yudao-server/src/main/resources/application-prod.yaml
@@ -169,13 +169,13 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta
one:
enabled: true
app-id: wx7e503d9cded34c07
- mch-id: 1641993417
+ mch-id: 1641073271
mch-key: qdn2I7Cmx4JeiKOt2CDjiu6UHgLTsOsM
- apiv3-key: cyywl666666cyywl888888cyywl66666
+ apiv3-key: cyywl123456cyywl654321cyywl12345
private-cert-path: classpath:/1/apiclient_cert.pem
private-key-path: classpath:/1/apiclient_key.pem
key-path: classpath:/1/apiclient_cert.p12
- cert-serial-no: 58FDB503F92B6C0E258C9940BB726C2BF6022E56
+ cert-serial-no: 7F76A4ADC52CA0B440C4E5698F8A5CD1633A0FCD
notify-url: http://api.cyywl.top/app-api/pay/wxpay/pay_notify
refund-notify-url: http://api.cyywl.top/app-api/pay/wxpay/refund_notify
two: