diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java
index d508e8555..4df00b9fe 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java
@@ -231,22 +231,6 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
             });
         }
 
-//        //将装置无数据的统计入库 按运维要求，判断装置的最新数据不是当天，则认为装置无数据
-//        List<LineDetailVO.noDataLineInfo> noDataLineInfo = lineFeignClient.getNoDataLine().getData();
-//        if (CollUtil.isNotEmpty(noDataLineInfo)) {
-//            LambdaQueryWrapper<LineWarning> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-//            lambdaQueryWrapper.eq(LineWarning::getTargetType, "0").eq(LineWarning::getAlarmTime, date);
-//            this.baseMapper.delete(lambdaQueryWrapper);
-//            noDataLineInfo.forEach(item -> {
-//                String deptId = Objects.isNull(deptLineMap.get(item.getLineId())) ? null : deptLineMap.get(item.getLineId()).get(0).getId();
-//                LineWarning lineWarning = new LineWarning();
-//                lineWarning.setAlarmTime(firstDayOfMonth);
-//                lineWarning.setDeptId(deptId);
-//                lineWarning.setLineId(item.getLineId());
-//                lineWarning.setTargetType("0");
-//                result.add(lineWarning);
-//            });
-//        }
         this.saveOrUpdateBatchByMultiId(result);
     }
 
diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/enums/AppRoleEnum.java b/pqs-user/user-api/src/main/java/com/njcn/user/enums/AppRoleEnum.java
index 1ec0f50d1..ea3531c1c 100644
--- a/pqs-user/user-api/src/main/java/com/njcn/user/enums/AppRoleEnum.java
+++ b/pqs-user/user-api/src/main/java/com/njcn/user/enums/AppRoleEnum.java
@@ -19,6 +19,8 @@ public enum AppRoleEnum {
     BXS_USER("bxs_user","便携式正式用户"),
     ROOT("root","超级管理员"),
     OPERATION_MANAGER("operation_manager","运维管理员"),
+    REGULAR_USER_8000("regular_user_8000","正式用户综合电能质量"),
+    REGULAR_USER("regular_user","正式用户物联云平台")
     ;
 
     private final String code;
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
index b99a97d52..6c36d17b9 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
@@ -490,7 +490,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         List<UserVO> users = new ArrayList<>();
         Role roleByCode1 = roleService.getRoleByCode(AppRoleEnum.APP_VIP_USER.getCode());
         Role roleByCode2 = roleService.getRoleByCode(AppRoleEnum.BXS_USER.getCode());
-        List<UserRole> userRoles = userRoleMapper.selectUserRole(Stream.of(roleByCode1.getId(),roleByCode2.getId()).collect(Collectors.toList()));
+        Role roleByCode3 = roleService.getRoleByCode(AppRoleEnum.REGULAR_USER_8000.getCode());
+        Role roleByCode4 = roleService.getRoleByCode(AppRoleEnum.REGULAR_USER.getCode());
+        List<UserRole> userRoles = userRoleMapper.selectUserRole(
+                Stream.of(roleByCode1.getId()
+                        ,roleByCode2.getId()
+                        ,roleByCode3.getId()
+                        ,roleByCode4.getId()
+                ).collect(Collectors.toList()));
         List<String> collect = userRoles.stream().map(UserRole::getUserId).distinct().collect(Collectors.toList());
         List<User> users1 = this.listByIds(collect);
         if (CollectionUtil.isNotEmpty(users1)) {