Merge branch 'system-zyj' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -80,6 +80,7 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
      */
     @Override
     public List<SysUser> selectAllocatedList(SysUser user) {
+        user.setTenantId(SecurityUtils.getTenantId());
         return userMapper.selectAllocatedList(user);
     }
 
@@ -91,6 +92,7 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
      */
     @Override
     public List<SysUser> selectUnallocatedList(SysUser user) {
+        user.setTenantId(SecurityUtils.getTenantId());
         return userMapper.selectUnallocatedList(user);
     }
 

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysUserMapper.xml

@@ -106,6 +106,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	    <if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>
+		<if test="tenantId != null and tenantId != '' and tenantId !=0">
+			AND u.tenant_id = #{tenantId}
+		</if>
 		<if test="phonenumber != null and phonenumber != ''">
 			AND u.phonenumber like concat('%', #{phonenumber}, '%')
 		</if>
@@ -124,6 +127,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	    <if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>
+		<if test="tenantId != null and tenantId != '' and tenantId !=0">
+			AND u.tenant_id = #{tenantId}
+		</if>
 		<if test="phonenumber != null and phonenumber != ''">
 			AND u.phonenumber like concat('%', #{phonenumber}, '%')
 		</if>