From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserServiceImpl.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserServiceImpl.java
index c1cfc1c..21ab47c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserServiceImpl.java
@@ -137,16 +137,18 @@
*/
@Override
public R getIntegralUserListApplets(Long userId, Long communityId) {
- // 查询该用户在本社区下的积分账户是否存在，不存在则需要给用户创建
- ComActIntegralUserDO integralUserDO =
- this.baseMapper.selectOne(new QueryWrapper<ComActIntegralUserDO>().lambda()
- .eq(ComActIntegralUserDO::getCommunityId, communityId).eq(ComActIntegralUserDO::getUserId, userId));
- if (integralUserDO == null) {
- integralUserDO = new ComActIntegralUserDO();
- integralUserDO.setCommunityId(communityId);
- integralUserDO.setUserId(userId);
- integralUserDO.setCreateAt(new Date());
- this.baseMapper.insert(integralUserDO);
+ if (nonNull(communityId)) {
+ // 查询该用户在本社区下的积分账户是否存在，不存在则需要给用户创建
+ ComActIntegralUserDO integralUserDO =
+ this.baseMapper.selectOne(new QueryWrapper<ComActIntegralUserDO>().lambda()
+ .eq(ComActIntegralUserDO::getCommunityId, communityId).eq(ComActIntegralUserDO::getUserId, userId));
+ if (integralUserDO == null) {
+ integralUserDO = new ComActIntegralUserDO();
+ integralUserDO.setCommunityId(communityId);
+ integralUserDO.setUserId(userId);
+ integralUserDO.setCreateAt(new Date());
+ this.baseMapper.insert(integralUserDO);
+ }
}
ComActIntegralUserVO integralUserVO = this.baseMapper.getUserIntegralStatistics(userId, communityId);
if (isNull(communityId)) {
--
Gitblit v1.7.1