From 987e38327f849e1b13d8541246dde08d877db0e8 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 07 一月 2026 14:10:43 +0800
Subject: [PATCH] 【市一】调整mapper获取ordid

---
 smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
index 1c723d2..cc69597 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
@@ -44,6 +44,7 @@
         <result property="score" column="score"/>
         <result property="prompt" column="prompt"/>
         <result property="groupName" column="group_name"/>
+        <result property="categoryid" column="categoryid"/>
 
     </resultMap>
 
@@ -52,6 +53,7 @@
                sort,
                ishide,
                prompt,
+               categoryid,
                group_name,
                branch_flag,
                branch_nextscriptno,
@@ -70,16 +72,19 @@
     <select id="selectSvyTaskTemplateScriptList" parameterType="com.smartor.domain.SvyTaskTemplateScript"
             resultMap="SvyTaskTemplateScriptResult">
         <include refid="selectSvyTaskTemplateScriptVo"/>
-        <where>
+        WHERE 1=1
+            <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
+
             <if test="taskid != null ">and taskid = #{taskid}</if>
+            <if test="categoryid != null ">and categoryid = #{categoryid}</if>
             <if test="ishide != null ">and ishide = #{ishide}</if>
             <if test="scriptno != null ">and scriptno = #{scriptno}</if>
             <if test="templateID != null ">and templateID = #{templateID}</if>
             <if test="scriptid != null ">and scriptid = #{scriptid}</if>
             <if test="scriptDesc != null  and scriptDesc != ''">and script_desc = #{scriptDesc}</if>
             <if test="language != null  and language != ''">and language = #{language}</if>
-            <if test="categoryName != null  and categoryName != ''">and categoryName like concat('%', #{categoryName},
-                '%')
+            <if test="categoryName != null  and categoryName != ''">
+                and categoryName like concat('%', #{categoryName},'%')
             </if>
             <if test="scriptContent != null  and scriptContent != ''">and script_content = #{scriptContent}</if>
             <if test="isMust != null  and isMust != ''">and is_must = #{isMust}</if>
@@ -107,7 +112,7 @@
             <if test="branchNextscriptno != null  and branchNextscriptno != ''">and branch_nextscriptno =
                 #{branchNextscriptno}
             </if>
-        </where>
+        
     </select>
 
     <select id="selectSvyTaskTemplateScriptByID" parameterType="Long" resultMap="SvyTaskTemplateScriptResult">
@@ -157,6 +162,7 @@
             <if test="prompt != null ">prompt,</if>
             <if test="groupName != null ">group_name,</if>
             <if test="ishide != null ">ishide,</if>
+            <if test="categoryid != null ">categoryid,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskid != null">#{taskid},</if>
@@ -197,6 +203,7 @@
             <if test="prompt != null ">#{prompt},</if>
             <if test="groupName != null ">#{groupName},</if>
             <if test="ishide != null ">#{ishide},</if>
+            <if test="categoryid != null ">#{categoryid},</if>
         </trim>
     </insert>
 
@@ -243,6 +250,7 @@
             <if test="prompt != null">prompt = #{prompt},</if>
             <if test="groupName != null ">group_name = #{groupName},</if>
             <if test="ishide != null ">ishide = #{ishide},</if>
+            <if test="categoryid != null ">categoryid = #{categoryid},</if>
         </trim>
         where id = #{d}
     </update>

--
Gitblit v1.9.3