0205

src/main/java/cn/ezhizao/project/system/controller/SysRoleController.java

@@ -23,6 +23,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -49,6 +50,8 @@ public class SysRoleController extends BaseController
 
     @Resource
     private ISysDeptService deptService;
+    @Resource
+    private HttpServletRequest request;
 
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/list")
@@ -208,6 +211,8 @@ public class SysRoleController extends BaseController
     @GetMapping("/authUser/unallocatedList")
     public TableDataInfo unallocatedList(SysUser user)
     {
+        String tenantId = request.getHeader("tenantId");
+        user.setTenantId(Long.valueOf(tenantId));
         startPage();
         List<SysUser> list = userService.selectUnallocatedList(user);
         return getDataTable(list);

src/main/java/cn/ezhizao/project/system/controller/SysUserController.java

@@ -75,7 +75,12 @@ public class SysUserController extends BaseController {
         List<SysUser> list = userService.selectUserList(user);
         return getDataTable(list);
     }
-
+    @GetMapping("/tenantList")
+    public TableDataInfo tenantList(SysUser user) throws NoSuchFieldException, IllegalAccessException {
+        startPage();
+        List<SysUser> list = userService.selectTenantList(user);
+        return getDataTable(list);
+    }
     @GetMapping("/listByLikeNickNameOrUserName")
     public TableDataInfo listByLikeNickNameOrUserName(SysUser user) throws NoSuchFieldException, IllegalAccessException {
         startPage();

src/main/java/cn/ezhizao/project/system/mapper/SysUserMapper.java

@@ -19,6 +19,13 @@ public interface SysUserMapper {
      * @return 用户信息集合信息
      */
     public List<SysUser> selectUserList(SysUser sysUser);
+    /**
+     * 根据条件分页查询用户列表
+     *
+     * @param sysUser 用户信息
+     * @return 用户信息集合信息
+     */
+    public List<SysUser> selectTenantList(SysUser sysUser);
 
     /**
      * 根据条件分页查询用户列表

src/main/java/cn/ezhizao/project/system/service/ISysUserService.java

@@ -18,6 +18,13 @@ public interface ISysUserService
      * @return 用户信息集合信息
      */
     List<SysUser> selectUserList(SysUser user);
+    /**
+     * 根据条件分页查询用户列表
+     *
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    List<SysUser> selectTenantList(SysUser user);
     /**
      * 根据条件分页查询用户列表
      *

src/main/java/cn/ezhizao/project/system/service/impl/SysUserServiceImpl.java

@@ -70,6 +70,16 @@ public class SysUserServiceImpl implements ISysUserService {
     public List<SysUser> selectUserList(SysUser user) {
         return userMapper.selectUserList(user);
     }
+    /**
+     * 根据条件分页查询用户列表
+     *
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    @Override
+    public List<SysUser> selectTenantList(SysUser user) {
+        return userMapper.selectTenantList(user);
+    }
 
     /**
      * 根据条件分页查询员工列表

src/main/resources/mybatis/system/SysUserMapper.xml

@@ -147,7 +147,51 @@
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
-
+	<select id="selectTenantList" parameterType="SysUser" resultMap="SysUserResult">
+		SELECT distinct u.user_id,
+		u.nick_name,
+		u.user_name,
+		u.email,
+		u.avatar,
+		u.phone_number,
+		u.sex,
+		u.status,
+		u.del_flag,
+		u.login_ip,
+		u.login_date,
+		u.create_by,
+		u.create_time,
+		u.usage_id,
+		u.usage_code,
+		u.remark FROM sys_user u
+		WHERE u.del_flag = '0'
+		<if test="userId != null and userId != 0">
+			AND u.user_id = #{userId}
+		</if>
+		<if test="tenantId != null and tenantId != 0">
+			AND u.tenant_id = #{tenantId}
+		</if>
+		<if test="deptId != null and deptId != 0">
+			AND d.dept_id = #{deptId}
+		</if>
+		<if test="userName != null and userName != ''">
+			AND u.user_name LIKE concat('%', #{userName}, '%')
+		</if>
+		<if test="nickName != null and nickName != ''">
+			AND u.nick_name LIKE concat('%', #{nickName}, '%')
+		</if>
+		<if test="status != null and status != ''">
+			AND u.status = #{status}
+		</if>
+		<if test="userType != null and userType != ''">
+			AND u.user_type = #{userType}
+		</if>
+		<if test="phoneNumber != null and phoneNumber != ''">
+			AND u.phone_number LIKE concat('%', #{phoneNumber}, '%')
+		</if>
+		<!-- 数据范围过滤 -->
+		${params.dataScope}
+	</select>
 	<!-- 员工列表 selectEmployeeList -->
 	<select id="selectEmployeeList" parameterType="SysUser" resultMap="SysUserResult">
 		SELECT
@@ -232,6 +276,7 @@
 		<if test="nickName != null and nickName != ''">
 			AND u.nick_name LIKE concat('%', #{nickName}, '%')
 		</if>
+		<if test="tenantId != null  and tenantId != 0"> AND u.tenant_id = #{tenantId}</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>