From 9810fce5f78d7a9d7cdf084f034b20cd02b84ebd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 三月 2025 17:31:02 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java | 9 ++++-----
admin/src/views/platform/platformGroup.vue | 4 ++--
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/platform/platformGroup.vue b/admin/src/views/platform/platformGroup.vue
index 4af7ef3..1abb876 100644
--- a/admin/src/views/platform/platformGroup.vue
+++ b/admin/src/views/platform/platformGroup.vue
@@ -28,8 +28,8 @@
</template>
</el-table-column>
<el-table-column prop="waitCallTime" label="鍙彿绛夊緟鏃堕棿锛堝垎閽燂級" min-width="140px" align="center"></el-table-column>
- <el-table-column prop="signInNoticeUserNames" label="绛惧埌閫氱煡浜哄憳" min-width="" align="center"></el-table-column>
- <el-table-column prop="unFinishNoticeUserNames" label="鏈畬鎴愪綔涓氶�氱煡浜哄憳" min-width=" " align="center"></el-table-column>
+ <el-table-column prop="signInNoticeUserNames" label="绛惧埌閫氱煡浜哄憳" min-width="200px" align="center"></el-table-column>
+ <el-table-column prop="unFinishNoticeUserNames" label="鏈畬鎴愪綔涓氶�氱煡浜哄憳" min-width="200px" align="center"></el-table-column>
<el-table-column prop="editDate" label="鏈�杩戞洿鏂版椂闂�" min-width="150px" align="center"></el-table-column>
<el-table-column
v-if="containPermissions(['business:platformgroup:update', 'business:platformgroup:delete'])"
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 2812565..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,7 +208,7 @@
}
}
systemUserList = systemUserMapper.selectList(new QueryWrapper<SystemUser>().lambda()
- .eq(SystemUser::getDeleted, Constants.ZERO).eq(SystemUser::getStatus, Constants.ZERO).isNotNull(SystemUser::getOpenid)
+ .eq(SystemUser::getDeleted, Constants.ZERO)
.in(SystemUser::getMemberId,ids0) );
if (systemUserList!=null) {
for(PlatformGroup platformGroup : result.getRecords()){
@@ -226,14 +226,13 @@
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.getMemberId().toString(),s)){
+ if(StringUtils.isNotBlank(name)){
+ name += ",";
+ }
name += StringUtils.defaultString(user.getRealname(),user.getUsername());
}
}
--
Gitblit v1.9.3