From 38a200d313231f6ffc5f0a8b0ddf5f678e4c58cb Mon Sep 17 00:00:00 2001
From: chenze <1824191732@qq.com>
Date: Wed, 14 Aug 2024 19:03:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86PC=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/RepairDeviceTypeController.java   | 10 +++++++++-
 .../service/impl/IcsCustomerStaffServiceImpl.java      |  1 -
 .../main/resources/mapper/admin/RepairAttachMapper.xml |  2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairDeviceTypeController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairDeviceTypeController.java
index 33d84c9..b6ee4e4 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairDeviceTypeController.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairDeviceTypeController.java
@@ -74,13 +74,13 @@ public class RepairDeviceTypeController extends BaseController {
                     IcsCustomerStaff staff = customerStaffService.selectIcsCustomerStaffById(relational.getUserId());
                     workersName.add(staff.getUsername());
                     staffLists.add(staff);
-
                 }
             }
             deviceType.setWorkerId(workerId);
             deviceType.setStaffLists(staffLists);
             if (workersName.size()>0){
                 deviceType.setWorker(workersName.get(0)+"等"+workersName.size()+"人");
+                deviceType.setWorkerName(workersName);
             }
             //根据用户id查询对应数据
         }
@@ -176,9 +176,17 @@ public class RepairDeviceTypeController extends BaseController {
         return toAjax(repairDeviceTypeService.deleteRepairDeviceTypeByIds(ids));
     }
 
+
+
     /**
      * 获取普通用户列表（新增为维修人或者派单员）
      */
+    @RequiresPermissions("RepairDeviceType:type:view")
+    @GetMapping("selectUserListByType")
+    public R selectUserListByType() {
+        return R.data(customerStaffService.selectUserListByType());
+    }
+
     /**
      * 根据设备类型id查询关联的派单员、维修人员
      */
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java
index 87b2599..5f34b50 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java
@@ -304,7 +304,6 @@ public class IcsCustomerStaffServiceImpl extends ServiceImpl<IcsCustomerStaffMap
 
         QueryWrapper<IcsCustomerStaff> wrapper = new QueryWrapper<>();
 
-        wrapper.eq("data_type", 1);
 
         return icsCustomerStaffMapper.selectList(wrapper);
     }
diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAttachMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAttachMapper.xml
index c6d21b3..dc9d56b 100644
--- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAttachMapper.xml
+++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairAttachMapper.xml
@@ -59,7 +59,7 @@
         select url from ics_repair_attach where repair_id=#{repairId} and node_id=1 and delete_flag=0 and ext1='img' order by id limit 1
     </select>
 
-    <insert id="insertRepairAttach" parameterType="com.ics.admin.domain.RepairAttach">
+    <insert id="insertRepairAttach" parameterType="com.ics.admin.domain.RepairAttach" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO ics_repair_attach
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="repairId != null ">repair_id,</if>