获取库管员接口修改

sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml

@@ -40,10 +40,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getMaUserList" resultType="com.bonus.sgzb.base.domain.WarehouseKeeper">
-        SELECT su.user_id as userId, su.nick_name as userName FROM `sys_user` su
+        SELECT distinct
-        LEFT JOIN sys_user_role sur  ON su.user_id = sur.user_id
+        su.user_id AS userId,
+        su.nick_name AS userName
+        FROM
+        `sys_user` su
+        LEFT JOIN sys_user_role sur ON su.user_id = sur.user_id
         LEFT JOIN sys_role sr ON sr.role_id = sur.role_id
-        WHERE sr.role_id = '132' AND su.del_flag = '0'
+        WHERE
+        sr.role_id IN ( '132', '139' )
+        AND su.del_flag = '0'
         <if test="userName != null and userName != ''">
             AND su.nick_name like concat('%', #{userName}, '%')
         </if>

sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -144,7 +144,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
-	
+	<select id="selectUserByRole" resultType="com.bonus.sgzb.system.api.domain.SysUser">
+		SELECT DISTINCT
+			u.user_id,
+			u.dept_id,
+			u.nick_name as userName,
+			u.email,
+			u.avatar,
+			u.phonenumber,
+			u.sex,
+			u.STATUS,
+			u.del_flag,
+			u.login_ip,
+			u.login_date,
+			u.create_by,
+			u.create_time,
+			u.remark
+		FROM
+			sys_user u
+				LEFT JOIN sys_user_role sur ON u.user_id = sur.user_id
+		WHERE
+			u.STATUS = '0'
+		  AND u.del_flag = '0'
+		  AND sur.role_id IN (133,134)
+	</select>
+
 	<insert id="insertUser" parameterType="com.bonus.sgzb.system.api.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(
  			<if test="userId != null and userId != 0">user_id,</if>
@@ -223,15 +247,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach> 
  	</delete>
 
-    <select id="selectUserByRole" resultMap="SysUserResult">
+
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber,
-			   u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time,
-			   u.remark
-		from sys_user u
-		left join sys_user_role sur on u.user_id = sur.user_id
-		where u.status = '0' and u.del_flag = '0'
-			<if test="roleId != null" >
-				and sur.role_id = #{roleId}
-			</if>
-    </select>
 </mapper>