新增根据租户ID查询大司空超管or租户管理员为其创建的企业管理员和管理员账号数量接口

dsk-admin/src/main/java/com/dsk/web/controller/system/SysUserController.java

 package com.dsk.web.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaCheckRole;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.dev33.satoken.secure.BCrypt;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.tree.Tree;
@@ -9,6 +11,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.dsk.biz.utils.ExcelUtils;
 import com.dsk.common.annotation.Log;
 import com.dsk.common.constant.GlobalConstants;
+import com.dsk.common.constant.TenantConstants;
 import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.domain.R;
@@ -16,6 +19,7 @@ import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.enums.BusinessType;
 import com.dsk.common.exception.ServiceException;
 import com.dsk.common.helper.LoginHelper;
+import com.dsk.common.tenant.helper.TenantHelper;
 import com.dsk.common.utils.StreamUtils;
 import com.dsk.common.utils.StringUtils;
 import com.dsk.common.utils.poi.ExcelUtil;
@@ -37,6 +41,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotNull;
 import java.util.*;
 
 /**
@@ -55,6 +60,16 @@ public class SysUserController extends BaseController {
     private final ISysPostService postService;
     private final ISysDeptService deptService;
 
+    /**
+     * 根据租户ID查询大司空超管or租户管理员为其创建的企业管理员和管理员账号数量
+     */
+    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY}, mode = SaMode.OR)
+    @SaCheckPermission(value = "system:user:query", orRole = "accountAdmin")
+    @GetMapping("/queryTenantAdminNumCreatedByDSK/{tenantId}")
+    public R<Long> queryTenantAdminNumCreatedByDSK(@NotNull(message = "租户ID不能为空") @PathVariable Long tenantId) {
+        return R.ok(TenantHelper.ignore(() -> userService.queryTenantAdminNumCreatedByDSK(tenantId)));
+    }
+
     /**
      * 获取用户列表
      */

dsk-system/src/main/java/com/dsk/system/service/ISysUserService.java

@@ -13,7 +13,13 @@ import java.util.List;
  * @author Lion Li
  */
 public interface ISysUserService {
-
+    /**
+     * 根据租户ID查询大司空超管or租户管理员为其创建的企业管理员和管理员账号数量
+     *
+     * @param tenantId 租户ID
+     * @return 该企业下企业管理员和管理员账号数量
+     */
+    Long queryTenantAdminNumCreatedByDSK(Long tenantId);
 
     TableDataInfo<SysUser> selectPageUserList(SysUser user, PageQuery pageQuery);
 

dsk-system/src/main/java/com/dsk/system/service/impl/SysUserServiceImpl.java

@@ -58,6 +58,22 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     private final SysUserRoleMapper userRoleMapper;
     private final SysUserPostMapper userPostMapper;
 
+    /**
+     * 根据租户ID查询大司空超管or租户管理员为其创建的企业管理员和管理员账号数量
+     *
+     * @param tenantId 租户ID
+     * @return 该企业下企业管理员和管理员账号数量
+     */
+    @Override
+    public Long queryTenantAdminNumCreatedByDSK(Long tenantId) {
+        LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<SysUser>()
+                .select(SysUser::getUserId)
+                .eq(SysUser::getStatus, UserConstants.USER_NORMAL)
+                .eq(SysUser::getTenantId, tenantId)
+                .eq(SysUser::getCreateBy, "suadmin");
+        return baseMapper.selectCount(queryWrapper);
+    }
+
     @Override
     public TableDataInfo<SysUser> selectPageUserList(SysUser user, PageQuery pageQuery) {
         Page<SysUser> page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user));
@@ -110,10 +126,15 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         QueryWrapper<SysUser> wrapper = Wrappers.query();
         wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)
                 .eq(ObjectUtil.isNotNull(user.getRoleId()), "r.role_id", user.getRoleId())
-                .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
+                .like(StringUtils.isNotBlank(user.getUserName()), "u.nick_name", user.getUserName())
                 .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
                 .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber());
         Page<SysUser> page = baseMapper.selectAllocatedList(pageQuery.build(), wrapper);
+        List<SysUser> userList = page.getRecords();
+        for (SysUser sysUser : userList) {
+            sysUser.setDept(deptMapper.selectOne(new LambdaQueryWrapper<SysDept>()
+                    .eq(SysDept::getDeptId, sysUser.getDeptId())));
+        }
         return TableDataInfo.build(page);
     }
 
@@ -130,9 +151,14 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)
                 .and(w -> w.ne("r.role_id", user.getRoleId()).or().isNull("r.role_id"))
                 .notIn(CollUtil.isNotEmpty(userIds), "u.user_id", userIds)
-                .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
+                .like(StringUtils.isNotBlank(user.getUserName()), "u.nick_name", user.getUserName())
                 .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber());
         Page<SysUser> page = baseMapper.selectUnallocatedList(pageQuery.build(), wrapper);
+        List<SysUser> userList = page.getRecords();
+        for (SysUser sysUser : userList) {
+            sysUser.setDept(deptMapper.selectOne(new LambdaQueryWrapper<SysDept>()
+                    .eq(SysDept::getDeptId, sysUser.getDeptId())));
+        }
         return TableDataInfo.build(page);
     }