From 87818db6f3c961cafce3948db64a97b024917624 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Tue, 21 Apr 2026 16:00:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/echarts/util/DrawPicUtil.java    |  2 +-
 .../user/service/impl/UserServiceImpl.java    | 26 ++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/pqs-common/common-echarts/src/main/java/com/njcn/echarts/util/DrawPicUtil.java b/pqs-common/common-echarts/src/main/java/com/njcn/echarts/util/DrawPicUtil.java
index af69d986b..8301490a0 100644
--- a/pqs-common/common-echarts/src/main/java/com/njcn/echarts/util/DrawPicUtil.java
+++ b/pqs-common/common-echarts/src/main/java/com/njcn/echarts/util/DrawPicUtil.java
@@ -57,8 +57,8 @@ public class DrawPicUtil {
 
 
     /***
-     * 绘制波形图
      * @author hongawen
+     * 绘制波形图
      * @date 2023/6/21 11:01
      * @return String base64数据
      */
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 abef285ac..db4c745a9 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,26 +490,28 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Override
     public List<UserVO> getFormalUserList() {
         List<UserVO> users = new ArrayList<>();
-        Role roleByCode1 = roleService.getRoleByCode(AppRoleEnum.APP_VIP_USER.getCode());
-        Role roleByCode2 = roleService.getRoleByCode(AppRoleEnum.BXS_USER.getCode());
-        Role roleByCode3 = roleService.getRoleByCode(AppRoleEnum.REGULAR_USER_8000.getCode());
-        Role roleByCode4 = roleService.getRoleByCode(AppRoleEnum.REGULAR_USER.getCode());
+        Role roleByCode1 = roleService.getRoleByCode(AppRoleEnum.ENGINEERING_USER.getCode());
+        Role roleByCode2 = roleService.getRoleByCode(AppRoleEnum.MARKET_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);
+
+        LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(User::getState, Arrays.asList(1,2,4,5))
+                .in(User::getType,Arrays.asList(2,3));
+        List<User> users1 = this.list(queryWrapper);
         if (CollectionUtil.isNotEmpty(users1)) {
             users1.forEach(item->{
-                if (item.getState() == 1) {
-                    UserVO userVO = new UserVO();
-                    userVO.setId(item.getId());
-                    userVO.setName(item.getName());
-                    users.add(userVO);
+                //剔除工程 营销用户
+                if (collect.contains(item.getId())) {
+                    return;
                 }
+                UserVO userVO = new UserVO();
+                userVO.setId(item.getId());
+                userVO.setName(item.getName());
+                users.add(userVO);
             });
         }
         return users;