Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/EquipmentTypeMapper.java

@@ -15,7 +15,6 @@ public interface EquipmentTypeMapper extends BaseMapper<EquipmentType> {
 
 
 
-    void wipeParentIdsData();
 
     void setTypeParentIds();
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentTypeServiceImpl.java

@@ -273,8 +273,6 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
 
     @Override
     public ResponseResult setTypeParentIds() {
-        //清空parent_ids字段
-        equipmentTypeMapper.wipeParentIdsData();
         //更新parent_ids字段
         equipmentTypeMapper.setTypeParentIds();
         return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);

jyzb-biz/src/main/resources/mapper/EquipmentTypeMapper.xml

@@ -19,30 +19,27 @@
   </sql>
 
 
-        <update id="wipeParentIdsData">
-        UPDATE base_equipment_type t
-        SET t.parent_ids = "";
-    </update>
 
     <update id="setTypeParentIds" parameterType="java.util.Map">
-WITH RECURSIVE cte AS (
-  SELECT id, parent_id, CAST(id AS CHAR(200)) AS parent_ids
-  FROM base_equipment_type
-  WHERE parent_id = "-1"
+        UPDATE base_equipment_type t1
+        SET t1.parent_ids = (
+            WITH RECURSIVE ParentHierarchy AS (
+                SELECT id, parent_id
+                FROM base_equipment_type
+                WHERE id = t1.id
 
-  UNION ALL
+                UNION
 
-  SELECT o.id, o.parent_id,
-         CASE
-           WHEN FIND_IN_SET(o.parent_id, cte.parent_ids) > 0 THEN cte.parent_ids
-           ELSE CONCAT(cte.parent_ids, ',', o.parent_id)
-         END AS parent_ids
-  FROM base_equipment_type o
-  INNER JOIN cte ON o.parent_id = cte.id
-)
-UPDATE base_equipment_type p
-JOIN cte ON p.id = cte.id
-SET p.parent_ids = cte.parent_ids;
+                SELECT t2.id, t2.parent_id
+                FROM ParentHierarchy ph
+                         JOIN base_equipment_type t2 ON ph.parent_id = t2.id
+            )
+            SELECT IFNULL(GROUP_CONCAT(
+                                  CASE WHEN parent_id != '00000000-0000-0000-0000-000000000000' THEN parent_id END
+                                      ORDER BY parent_id SEPARATOR ','), '')
+            FROM ParentHierarchy
+        )
+        WHERE t1.parent_id IS NOT NULL;
     </update>
     <select id="selectByItems" resultType="java.lang.String">
         SELECT DISTINCT t4.id, t4.parent_id