浏览代码

bugfix:中台权限修改

lyx 15 小时之前
父节点
当前提交
3ac6c9e62d

+ 2 - 1
alien-entity/src/main/resources/mapper/LifeSysMapper.xml

@@ -6,7 +6,8 @@
     <select id="selectPageAndRoleName" resultType="shop.alien.entity.store.vo.LifeSysVo">
         SELECT
             ls.*,
-            IFNULL(GROUP_CONCAT(DISTINCT lsr.role_name SEPARATOR ','), '') AS roleName
+            IFNULL(GROUP_CONCAT(DISTINCT lsr.role_name SEPARATOR ','), '') AS roleName,
+            IFNULL(GROUP_CONCAT(DISTINCT lsr.role_id SEPARATOR ','), '') AS roleId
         FROM life_sys ls
                  LEFT JOIN life_sys_user_role lsur ON lsur.user_id = ls.id
                  LEFT JOIN life_sys_role lsr ON lsr.role_id = lsur.role_id

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/impl/SystemServiceImpl.java

@@ -445,7 +445,7 @@ public class SystemServiceImpl extends ServiceImpl<LifeSysMapper, LifeSys> imple
             queryWrapper.eq("ls.department_id", departmentId);
         }
 
-        queryWrapper.eq("ls.status", 1);
+//        queryWrapper.eq("ls.status", 1);
 
         // 如果指定了角色ID,需要先查询角色关联表获取用户ID列表
         if (roleId != null) {