用户管理-列表查询

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

@@ -62,12 +62,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectUserList" parameterType="com.bizmatics.model.system.SysUser" resultMap="SysUserResult">
 		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
-		where u.del_flag = '0'
+		where u.del_flag = '0' and  u.user_type='00'
 		<if test="userName != null and userName != ''">
 			AND u.user_name like binary concat('%', #{userName}, '%')
 		</if>
-		<if test="createByOne != null and createByOne != ''">
-			AND  u.create_by = binary #{createByOne}
+		<if test="tenantId != null and tenantId != '' and tenantId != 0">
+			AND  u.tenant_id = #{tenantId}
 		</if>
 		<if test="status != null and status != ''">
 			AND u.status = #{status}

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

@@ -4,6 +4,7 @@ import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.core.exception.BusinessException;
 import com.bizmatics.common.core.util.StringUtils;
 import com.bizmatics.model.SysTenant;
+import com.bizmatics.model.SysTenantMenu;
 import com.bizmatics.model.UserSite;
 import com.bizmatics.model.constants.UserConstants;
 import com.bizmatics.model.system.*;
@@ -62,8 +63,9 @@ public class SysUserServiceImpl implements ISysUserService {
     @Override
     @DataScope(deptAlias = "d", userAlias = "u")
     public List<SysUser> selectUserList(SysUser user) {
-        String createBy = SecurityUtils.getLoginUser().getUser().getUserName();
-        user.setCreateByOne(createBy);
+        Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
+        List<SysUser> sysMenuList = userMapper.getTenantId(userId);
+        user.setTenantId(sysMenuList.get(0).getTenantId());
         return userMapper.selectUserList(user);
     }