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

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

@@ -577,13 +577,21 @@ public class AdminUserLogic {
         if (adminUser.getType() != 2) {
             companyWechatId = adminUser.getAdminCompanyWechat().getCompanyWechatId();
         }
+        if (adminUser.getIsMaster() && adminUser.getType() == 0) {
+            // 网点主账号能看到账号
+        }
+
         IPage<AdminUser> page = adminUserService.lambdaQuery()
                 .eq(StringUtils.isNotBlank(companyWechatId), AdminUser::getCompanyWechatId, companyWechatId)
                 .like(StringUtils.isNotBlank(companyWechatName), AdminUser::getCompanyName, companyWechatName)
                 .eq(StringUtils.isNotBlank(roleId), AdminUser::getRoleId, roleId)
                 .eq(status != null, AdminUser::getStatus, status)
-                .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()), AdminUser::getCompanyWechatId, adminUser.getCompanyWechatIds())
                 .like(StringUtils.isNotBlank(userName), AdminUser::getUserName, userName)
+                .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()), AdminUser::getCompanyWechatId, adminUser.getCompanyWechatIds())
+                .and(adminUser.getIsMaster() && adminUser.getType() == 0, v -> v.eq(AdminUser::getAdminUserId, adminUser.getAdminUserId())
+                        .or()
+                        .in(AdminUser::getMasterWebsitId, adminUser.getAdminWebsitIds()))
+                .eq(!adminUser.getIsMaster() && adminUser.getType() == 0, AdminUser::getAdminUserId, adminUser.getAdminUserId())
                 .orderByDesc(AdminUser::getCompanyWechatId)
                 .orderByAsc(AdminUser::getCreateTime)
                 .page(new Page<>(pageNum, pageSize));

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

@@ -271,12 +271,13 @@ public class AdminWebsitLogic {
 
     private void addAdminUser(AdminWebsitNewBean adminWebsit) {
         AdminUserAddReqBean adminUser = new AdminUserAddReqBean();
+
         adminUser.setCompanyWechatId(adminWebsit.getCompanyWechatId())
                 .setCompanyName(adminWebsit.getCompanyWechatName())
                 .setUserName(adminWebsit.getWebsitId() + "01")
                 .setNickName(adminWebsit.getName())
                 .setRoleId("1831614042544427009")
-                .setPassword("123456")
+                .setPassword(adminWebsit.getLegalMobile())
                 .setPubNotice(true)
                 .setIsVender(false)
                 .setLinkPhone(adminWebsit.getLinkMobile());