From 89fb131a79db1a09df9be061d08924bf0cb09b1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Sat, 8 Mar 2025 09:17:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=88=A0=E9=99=A4=E6=97=B6-?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8BCQM=E7=9A=84=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/DeviceTypeController.java     | 14 ++++++++++++++
 .../resources/mapper/TBaseDeviceTypeMapper.xml     |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceTypeController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceTypeController.java
index d0db9545..bd8c2b65 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceTypeController.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceTypeController.java
@@ -17,8 +17,10 @@ import com.nflg.mobilebroken.common.pojo.vo.CqmPersionResultVO;
 import com.nflg.mobilebroken.common.pojo.vo.CqmPersonVO;
 import com.nflg.mobilebroken.common.util.AdminUserUtil;
 import com.nflg.mobilebroken.common.util.VUtils;
+import com.nflg.mobilebroken.repository.entity.AdminUser;
 import com.nflg.mobilebroken.repository.entity.ParamConfig;
 import com.nflg.mobilebroken.repository.entity.TBaseDeviceType;
+import com.nflg.mobilebroken.repository.service.IAdminUserService;
 import com.nflg.mobilebroken.repository.service.IParamConfigService;
 import com.nflg.mobilebroken.repository.service.ITBaseDeviceTypeService;
 import com.nflg.mobilebroken.starter.annotation.MethodInfoMark;
@@ -45,6 +47,11 @@ public class DeviceTypeController extends ControllerBase {
     @Resource
     IParamConfigService paramConfigService;
 
+    @Resource
+    IAdminUserService adminUserService;
+
+
+
     /**
      * 获取设备类型列表
      * @param query
@@ -54,6 +61,13 @@ public class DeviceTypeController extends ControllerBase {
     @ApiMark(moduleName = "设备类型管理", apiName = "获取设备类型列表")
     public ApiResult<PageData<TBaseDeviceTypeVO>> getList(@RequestBody DeviceTypeQuery query){
         Page<TBaseDeviceType> result = baseDeviceTypeService.getList(new Page<>(query.getPage(),query.getPageSize()), query);
+        result.getRecords().forEach(u->{
+            if(StrUtil.isNotBlank(u.getCqmPersonId())){
+                List<AdminUser> adminUsers = adminUserService.lambdaQuery().eq(AdminUser::getIsDel, 0).in(AdminUser::getId, StrUtil.split(u.getCqmPersonId(), ",")).list();
+                u.setCqmPersonId(StrUtil.join(",", adminUsers.stream().map(u1->u1.getUserName()).collect(Collectors.toList())));
+                u.setCqmPersonName(StrUtil.join(",", adminUsers.stream().map(u1->u1.getUserName()).collect(Collectors.toList())));
+            }
+        });
         return ApiResult.success(Convert.toList(TBaseDeviceTypeVO.class,result.getRecords()) ,query,result.getTotal());
     }
 
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDeviceTypeMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDeviceTypeMapper.xml
index 85c7e9d8..644b8e1e 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDeviceTypeMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDeviceTypeMapper.xml
@@ -41,7 +41,7 @@
     <select id="getDeviceTypeCqmList" resultType="com.nflg.mobilebroken.common.pojo.vo.CqmPersionResultVO">
         select a.id,a.user_code, a.user_name,a.department_id,b.dept_code,b.dept_name from admin_user a
         join t_base_department b on a.department_id=b.id
-        where a.id in
+        where a.is_del=0 and   a.id in
             <foreach collection="ids" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>