From c04a3b4738ba6752ef296f322c085d71b9c2f594 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Wed, 26 Jun 2024 09:35:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=91=98=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/base/MaintenanceGangMapper.xml     | 12 ++++++--
 .../service/impl/MaWholeSetServiceImpl.java   | 28 ++++++++++---------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaintenanceGangMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaintenanceGangMapper.xml
index 77efc6d4..06cb994b 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaintenanceGangMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaintenanceGangMapper.xml
@@ -45,10 +45,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getMaUserList" resultType="com.bonus.sgzb.base.domain.MaintenanceGang">
-        SELECT su.user_id as userId, su.nick_name as userName FROM `sys_user` su
-        LEFT JOIN sys_user_role sur  ON su.user_id = sur.user_id
+        SELECT DISTINCT
+        su.user_id AS userId,
+        su.nick_name AS userName
+        FROM
+        `sys_user` su
+        LEFT JOIN sys_user_role sur ON su.user_id = sur.user_id
         LEFT JOIN sys_role sr ON sr.role_id = sur.role_id
-        WHERE sr.role_id = '102' AND su.del_flag = '0'
+        WHERE
+        sr.role_id in (133,134)
+        AND su.del_flag = '0'
         <if test="userName != null and userName != ''">
             AND su.nick_name like concat('%', #{userName}, '%')
         </if>
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java
index 641db2be..8da52fc2 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java
@@ -148,24 +148,26 @@ public class MaWholeSetServiceImpl implements MaWholeSetService {
                 maWhole.setWholeTypeName(dto.getWholeTypeName());
                 maWhole.setParentId(dto.getParentId());
             }
-        }
-        int res = 0;
-        try {
-            deleteMaWhole(dto);
-            res = insertMaWholeSet(dto.getDeviceInfo());
-            if (res == 0) {
-                log.error("insertMaWholeSet方法插入异常");
-                throw new RuntimeException("insertMaWholeSet方法插入异常");
-            }
+            int res = 0;
+            try {
+                deleteMaWhole(dto);
+                res = insertMaWholeSet(dto.getDeviceInfo());
+                if (res == 0) {
+                    log.error("insertMaWholeSet方法插入异常");
+                    throw new RuntimeException("insertMaWholeSet方法插入异常");
+                }
           /*  int count = selectByParentId(dto.getWholeTypeName());
             if (count > 1) {
                 throw new RuntimeException("配套名称已重复，请重新输入");
             }*/
-        } catch (Exception e) {
-            e.printStackTrace();
-            return AjaxResult.error(ExceptionEnum.UPDATE_TO_DATABASE.getCode(), ExceptionEnum.UPDATE_TO_DATABASE.getMsg());
+            } catch (Exception e) {
+                e.printStackTrace();
+                return AjaxResult.error(ExceptionEnum.UPDATE_TO_DATABASE.getCode(), ExceptionEnum.UPDATE_TO_DATABASE.getMsg());
+            }
+            return AjaxResult.success("修改成功", res);
+        } else {
+            return AjaxResult.error("请选择主/配套设备");
         }
-        return AjaxResult.success("修改成功", res);
     }
 
     /**