Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -430,6 +430,32 @@ public class AdminUserLogic {
                 .orderByDesc(AdminUser::getCompanyWechatId)
                 .orderByAsc(AdminUser::getCreateTime)
                 .page(new Page<>(pageNum, pageSize));
+
+        for (AdminUser record : page.getRecords()) {
+            AdminUserWebsitRela adminUserWebsitRela = adminUserWebsitRelaService.lambdaQuery().eq(AdminUserWebsitRela::getAdminUserId, record.getAdminUserId()).last("limit 1").one();
+
+            AdminUserDeptRela adminUserDeptRela = adminUserDeptRelaService.lambdaQuery().eq(AdminUserDeptRela::getAdminUserId, record.getAdminUserId()).last("limit 1").one();
+
+
+
+            if (adminUserDeptRela != null){
+
+                AdminDept adminDept = adminDeptService.getById(adminUserDeptRela.getAdminDeptId());
+
+                record.setDeptWebsitName(adminDept.getDeptName());
+
+            }else if (adminUserWebsitRela != null){
+
+                AdminWebsit adminWebsit = adminWebsitService.getById(adminUserWebsitRela.getAdminWebsitId());
+                record.setDeptWebsitName(adminWebsit.getName());
+            }
+
+
+
+        }
+
+
+
         return page;
     }