From e5ead76e6f88915ac4f7b694f98a3f3740565c55 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期三, 04 九月 2024 09:17:49 +0800
Subject: [PATCH] 排班管理添加权限编号

---
 pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml |   15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
index c3ee987..ff0cff8 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
@@ -414,22 +414,11 @@
         where ap.id = #{planId}  and pn.id= #{nodeId}
     </select>
 
-
-    <resultMap id="jsonResultMap" type="java.util.HashMap">
-        <id column="planId" property="planId"/>
-        <result column="planName" property="planName"/>
-        <result column="status" property="status"/>
-
-        <collection property="nodes" javaType="java.util.HashMap">
-            <result column="content" property="content"/>
-            <result column="nodeId" property="nodeId"/>
-        </collection>
-    </resultMap>
-    <select id="selectByPlanName" resultMap="jsonResultMap">
+    <select id="selectByPlanName" resultType="cn.hutool.json.JSONObject">
         select ap.id planId,ap.name planName,ap.`status`,pn.id nodeId,pn.content from pr_assembly_plan ap
         left join pr_production_node pn on ap.process_id = pn.process_id
         where status != -1
-        <if test="planName != null and planName!= null">
+        <if test="planName != null and planName!= ''">
             and ap.name like concat('%', #{planName}, '%')
         </if>
     </select>

--
Gitblit v1.8.0