Browse Source

fix:超管可查看所有预警用户

陈长荣 6 months ago
parent
commit
a0402efa12

+ 8 - 0
snowy-plugin-api/snowy-plugin-auth-api/src/main/java/vip/xiaonuo/auth/core/pojo/SaBaseLoginUser.java

@@ -250,6 +250,14 @@ public abstract class SaBaseLoginUser {
     /** 是否可登录,由继承类实现 */
     public abstract Boolean getEnabled();
 
+
+    /**
+     * 是否拥有超管角色
+     */
+    public boolean isSuperAdmin() {
+        return this.roleCodeList != null && this.roleCodeList.contains("superAdmin");
+    }
+
     /**
      * 数据范围类
      *

+ 3 - 1
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/alarmuser/service/impl/AlarmUserServiceImpl.java

@@ -85,7 +85,9 @@ public class AlarmUserServiceImpl extends ServiceImpl<AlarmUserMapper, AlarmUser
         } else {
             queryWrapper.lambda().orderByDesc(AlarmUser::getCreateTime);
         }
-        queryWrapper.lambda().eq(AlarmUser::getCreateOrg, loginUser.getOrgId()).eq(AlarmUser::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
+        queryWrapper.lambda()
+                .eq(!loginUser.isSuperAdmin(), AlarmUser::getCreateOrg, loginUser.getOrgId())
+                .eq(AlarmUser::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
         Page<AlarmUser> page = this.page(CommonPageRequest.defaultPage(), queryWrapper);
         if (page.getTotal() < 1) {
             return Page.of(page.getCurrent(), page.getSize());