From 51b8a10208ce56e21d833b25c06f90ee2b89459a Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Mon, 24 Jun 2024 18:07:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=94=E5=9B=9E=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/service/impl/MaTypeServiceImpl.java  | 19 +++++++++++++++++--
 .../mapper/base/MaMachineTypeMapper.xml       |  2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java
index 891bc555..75d9a733 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java
@@ -37,10 +37,25 @@ public class MaTypeServiceImpl implements ITypeService {
      */
     @Override
     public MaType selectMaTypeByTypeId(Long typeId) {
-        return maTypeMapper.selectMaTypeByTypeId(typeId);
+        MaType maType = maTypeMapper.selectMaTypeByTypeId(typeId);
+        List<Long> idList = new ArrayList<>();
+        if (maType.getKeeperUserId() != null) {
+            String[] idStrings = maType.getTypeName().split(",");
+            for (String idString : idStrings) {
+                try {
+                    Long id = Long.parseLong(idString.trim());
+                    idList.add(id);
+                } catch (NumberFormatException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        maType.setKeeperUserId(idList);
+        return maType;
     }
 
 
+
     /**
      * 新增机具类型管理ma_type
      *
@@ -48,7 +63,7 @@ public class MaTypeServiceImpl implements ITypeService {
      * @return 结果
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public int insertMaType(MaType maType) {
         Long parentId = maType.getParentId();
         MaType maType1 = maTypeMapper.selectMaTypeByTypeId(parentId);
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
index 5e5349e8..f3bb888f 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
@@ -337,7 +337,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select m.type_id, m.type_name, m.parent_id, m.status, m.num, m.unit_id, m.unit_name, m.manage_type,
         m.lease_price,m.rent_price, m.eff_time, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load,
         m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl,
-        mtf2.file_name documentName, mtf2.file_url documentUrl, GROUP_CONCAT(mtk.user_id) keeperUserId,
+        mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
         GROUP_CONCAT(su.nick_name) keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time,
         m.remark, m.company_id,m.fac_model as facModel
         from ma_type m