From f0ed73b8faa5e86ac79dce309c8a28bb1b918554 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 16 四月 2025 16:44:27 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
index f959ee4..dadaac3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
@@ -208,8 +208,8 @@
}
}
systemUserList = systemUserMapper.selectList(new QueryWrapper<SystemUser>().lambda()
- .eq(SystemUser::getDeleted, Constants.ZERO).eq(SystemUser::getStatus, Constants.ZERO).isNotNull(SystemUser::getOpenid)
- .in(SystemUser::getId,ids0) );
+ .eq(SystemUser::getDeleted, Constants.ZERO)
+ .in(SystemUser::getMemberId,ids0) );
if (systemUserList!=null) {
for(PlatformGroup platformGroup : result.getRecords()){
platformGroup.setSignInNoticeUserNames(getUserNameFromList(0,platformGroup,systemUserList));
@@ -222,18 +222,17 @@
}
private String getUserNameFromList(int i, PlatformGroup platformGroup, List<SystemUser> systemUserList) {
- String ids = i ==0?platformGroup.getSignInNoticeUsers():platformGroup.getSignInNoticeUsers();
+ String ids = i ==0?platformGroup.getSignInNoticeUsers():platformGroup.getUnFinishNoticeUsers();
String name = "";
if( StringUtils.isNotBlank(ids)) {
List<String > ids0 = Arrays.asList(ids.split(","));
-
if (systemUserList!=null) {
for(SystemUser user :systemUserList){
for(String s : ids0){
- if(StringUtils.isNotBlank(name)){
- name += ",";
- }
- if(StringUtils.equals(user.getId().toString(),s)){
+ if(StringUtils.equals(user.getMemberId().toString(),s)){
+ if(StringUtils.isNotBlank(name)){
+ name += ",";
+ }
name += StringUtils.defaultString(user.getRealname(),user.getUsername());
}
}
--
Gitblit v1.9.3