From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewStriveForServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewStriveForServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewStriveForServiceImpl.java
index 07b0ad5..3468248 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewStriveForServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewStriveForServiceImpl.java
@@ -38,17 +38,17 @@
@Override
public String getAllintegral(String type,String userId)
{
- if(StringUtils.equals("1",type))
- {
+// if(StringUtils.equals("1",type))
+// {
List<String> userIds=new ArrayList<>();
userIds.add(userId);
return baseMapper.getAllintegral(userIds);
- }
- else
- {
- List<String> userIds=baseMapper.getPartyMember(userId);
- return baseMapper.getAllintegral(userIds);
- }
+// }
+// else
+// {
+// List<String> userIds=baseMapper.getPartyMember(userId);
+// return baseMapper.getAllintegral(userIds);
+// }
}
@Override
--
Gitblit v1.7.1