租户管理-管理员配置-新增、修改、删除、密码重置、列表查询、管理员查询上传2

fiveep-controller/src/main/java/com/bizmatics/controller/web/UserConfigController.java

@@ -139,10 +139,11 @@ public class UserConfigController extends BaseController {
      * @return
      */
     @GetMapping("getUserList")
-    public ApiResult<CommonPage<SysUser>> getUserList(@RequestParam Integer tenantId,
+    public ApiResult<CommonPage<SysUser>> getUserList(@RequestParam(value = "tenantId", required = false, defaultValue = "0") Integer tenantId,
                                                       @RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
-                                                      @RequestParam(value = "size", required = false, defaultValue = "0") Integer size) {
-        return ApiResult.success(userService.userList(tenantId, page, size));
+                                                      @RequestParam(value = "size", required = false, defaultValue = "0") Integer size,
+                                                      @RequestParam(value = "userId", required = false, defaultValue = "0") long userId) {
+        return ApiResult.success(userService.userList(tenantId, page, size,userId));
     }
 
 

fiveep-model/src/main/java/com/bizmatics/model/vo/SysTenantOneVo.java

@@ -21,6 +21,12 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 public class SysTenantOneVo implements Serializable {
+
+    /**
+     * 租户ID
+     */
+    private Integer id;
+
     /**
      * 租户名称
      */

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/SysTenantMapper.java

@@ -27,7 +27,8 @@ public interface SysTenantMapper extends CrudMapper<SysTenant> {
                                   @Param("startTime") String startTime,
                                   @Param("endTime") String endTime,
                                   @Param("current") Integer current,
-                                  @Param("size") Integer size);
+                                  @Param("size") Integer size,
+                                  @Param("id") Integer id);
 
     List<SysTenant> getTenantDataOne(@Param("tenantName") String tenantName,
                                      @Param("tenantManager") String tenantManager,

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/system/SysUserMapper.java

@@ -34,7 +34,7 @@ public interface SysUserMapper
 
     public List<SysUser> getTenantId(Long userId);
 
-    public List<SysUser> getUserData(Integer tenantId,Integer current,Integer size);
+    public List<SysUser> getUserData(Integer tenantId,Integer current,Integer size,long userId);
 
 
     /**

fiveep-persistence/src/main/resources/mapper/mysql/SysTenantMapper.xml

@@ -41,6 +41,9 @@
         FROM
         sys_tenant
         <where>
+            <if test="id != null and id != '' and id!=0">
+                and id = #{id}
+            </if>
             <if test="tenantName != null and tenantName != ''">
                 and tenant_name LIKE CONCAT(CONCAT('%', #{tenantName}), '%')
             </if>

fiveep-persistence/src/main/resources/mapper/mysql/system/SysUserMapper.xml

@@ -98,7 +98,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="getUserData" parameterType="com.bizmatics.model.system.SysUser"
 			resultType="com.bizmatics.model.system.SysUser">
 		SELECT * FROM sys_user
-		where tenant_id = #{tenantId} AND del_flag=0 and user_type='01'  order by user_id
+		where
+
+		 del_flag=0 and user_type='01'
+		<if test="tenantId != null and tenantId != 0">
+		 and 	tenant_id = #{tenantId}
+		</if>
+		<if test="userId != null and userId != 0">
+		   and 	user_id = #{userId}
+		</if>
+		order by user_id
 		<if test="current != null and size != null and size != 0">
 			limit #{current},#{size}
 		</if>

fiveep-service/src/main/java/com/bizmatics/service/impl/SysTenantServiceImpl.java

@@ -47,7 +47,7 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
                 sysTenantOneVo.getTenantType(),
                 sysTenantOneVo.getStatus(),
                 sysTenantOneVo.getStartTime(),
-                sysTenantOneVo.getEndTime(), null, null);
+                sysTenantOneVo.getEndTime(), null, null,sysTenantOneVo.getId());
         int total = 0;
         if (list1.size() > 0) {
             total = list1.size();
@@ -63,7 +63,8 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
                 sysTenantOneVo.getStartTime(),
                 sysTenantOneVo.getEndTime(),
                 current,
-                sysTenantOneVo.getSize());
+                sysTenantOneVo.getSize(),
+                sysTenantOneVo.getId());
         return new CommonPage<>(list, total, sysTenantOneVo.getSize(), sysTenantOneVo.getPage());
     }
 

fiveep-service/src/main/java/com/bizmatics/service/system/ISysUserService.java

@@ -217,5 +217,5 @@ public interface ISysUserService {
 
     public int addUser(SysUser user);
 
-    public CommonPage<SysUser> userList(Integer tenantId, Integer page, Integer size);
+    public CommonPage<SysUser> userList(Integer tenantId, Integer page, Integer size,long userId);
 }

fiveep-service/src/main/java/com/bizmatics/service/system/impl/SysUserServiceImpl.java

@@ -567,8 +567,8 @@ public class SysUserServiceImpl implements ISysUserService {
 
 
     @Override
-    public CommonPage <SysUser> userList(Integer tenantId,Integer page,Integer size) {
-        List<SysUser> list1 = userMapper.getUserData(tenantId,null,null);
+    public CommonPage <SysUser> userList(Integer tenantId,Integer page,Integer size,long userId) {
+        List<SysUser> list1 = userMapper.getUserData(tenantId,null,null,userId);
         int total = 0;
         if (list1.size() > 0) {
             total = list1.size();
@@ -577,7 +577,7 @@ public class SysUserServiceImpl implements ISysUserService {
         if (page!=null&&size>0){
             current = (page - 1) * size;
         }
-        List<SysUser> list = userMapper.getUserData(tenantId, current, size);
+        List<SysUser> list = userMapper.getUserData(tenantId, current, size,userId);
         return new CommonPage<>(list, total, size, page);
     }
 }