仓库管理库管设置查询人员修改

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StUserRightMapper.xml

@@ -21,13 +21,21 @@
     <select id="findNoUserRightByTheId" resultType="org.springblade.system.pojo.entity.User">
         SELECT DISTINCT u.*
         FROM BLADE_USER u
+                 -- 关联角色表，筛选库管员角色
+                 LEFT JOIN BLADE_ROLE rl
+                           ON TO_NUMBER(u.ROLE_ID) = rl.ID
+                               AND rl.IS_DELETED = 0
                  LEFT JOIN ST_USER_RIGHT r
                            ON u.ID = r.USER_ID
                                AND r.UR_TYPE = #{urType}
                                AND r.THE_ID  = #{theId}
                                AND r.IS_DELETED = 0
         WHERE r.ID IS NULL
+          AND rl.ROLE_ALIAS = '库管员'
+          AND rl.ID IS NOT NULL
           AND u.IS_DELETED = 0
+          -- 过滤掉ROLE_ID非数字的记录，避免转换失败
+          AND REGEXP_LIKE(u.ROLE_ID, '^[0-9]+$');
     </select>
 
     <select id="findByTheIdAndUrType" resultMap="stUserRightResultMap">