‘linchangsheng’ 5 miesięcy temu
rodzic
commit
1377040cc1

+ 5 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/comlist/WorkerComListLogic.java

@@ -71,7 +71,9 @@ public class WorkerComListLogic {
         } else {
             //以登录人为准
             List<WebsitUser> websitUsers = websitUserService.lambdaQuery()
-                    .in(WebsitUser::getWebsitId, adminUser.getAdminWebsitIds()).select(WebsitUser::getWorkerNumber).list();
+                    .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()),WebsitUser::getWebsitId, adminUser.getAdminWebsitIds())
+                    .isNotNull(WebsitUser::getWorkerNumber)
+                    .select(WebsitUser::getWorkerNumber).list();
             List<String> collect = websitUsers.stream().map(WebsitUser::getWorkerNumber).collect(Collectors.toList());
 
             List<WorkerComListWebsit> websit = workerComListWebsitService.lambdaQuery()
@@ -126,6 +128,8 @@ public class WorkerComListLogic {
         workerComList.setFileUrl(fileUrl);
         workerComList.setCreateTime(new Date());
         workerComList.setUpdateTime(new Date());
+        workerComList.setCompanyWechatId(adminUser.getCompanyWechatId());
+        workerComList.setCompanyWechatName(adminUser.getCompanyName());
         workerComList.insert();
 
        // String url = ossUtil.getUrl(fileUrl);