From fcb98e4558897945a316d04555923355b8e60605 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 21 七月 2026 10:16:56 +0800
Subject: [PATCH] Merge branch 'master' into master-任务组

---
 smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml |   66 ++++++++++++++++++++++++++++++++-
 1 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml
index f29b628..fd1a9fb 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml
@@ -17,6 +17,11 @@
         <result property="radix" column="radix"/>
         <result property="guid" column="guid"/>
         <result property="orgid" column="orgid"/>
+        <result property="url" column="url"/>
+        <result property="wardCode" column="ward_code"/>
+        <result property="wardName" column="ward_name"/>
+        <result property="deptCode" column="dept_code"/>
+        <result property="deptName" column="dept_name"/>
     </resultMap>
 
     <sql id="selectServiceOutPathVo">
@@ -31,6 +36,11 @@
                radix,
                guid,
                orgid,
+               url,
+               ward_code,
+               ward_name,
+               dept_code,
+               dept_name,
                del_flag
         from service_out_path
     </sql>
@@ -40,7 +50,6 @@
         <include refid="selectServiceOutPathVo"/>
         where 1=1
         and del_flag = 0
-        and orgid is null
         <if test="param1 != null ">
             and param1 = #{param1}
         </if>
@@ -62,7 +71,22 @@
         <if test="radix != null  and radix != ''">
             and radix=#{radix}
         </if>
+        <if test="url != null  and url != ''">
+            and url=#{url}
+        </if>
+        <if test="wardCode != null  and wardCode != ''">
+            and ward_code=#{wardCode}
+        </if>
 
+        <if test="wardName != null  and wardName != ''">
+            and ward_name=#{wardName}
+        </if>
+        <if test="deptCode != null  and deptCode != ''">
+            and dept_code=#{deptCode}
+        </if>
+        <if test="deptName != null  and deptName != ''">
+            and dept_name=#{deptName}
+        </if>
     </select>
 
     <select id="selectServiceOutPathById" parameterType="Long"
@@ -91,6 +115,16 @@
             </if>
             <if test="createTime != null">create_time,
             </if>
+            <if test="url != null">url,
+            </if>
+            <if test="wardCode != null">ward_code,
+            </if>
+            <if test="wardName != null">ward_name,
+            </if>
+            <if test="deptCode != null">dept_code,
+            </if>
+            <if test="deptName != null">dept_name,
+            </if>
 
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -109,6 +143,16 @@
             <if test="orgid != null">#{orgid},
             </if>
             <if test="createTime != null">#{createTime},
+            </if>
+            <if test="url != null">#{url},
+            </if>
+            <if test="wardCode != null">#{wardCode},
+            </if>
+            <if test="wardName != null">#{wardName},
+            </if>
+            <if test="deptCode != null">#{deptCode},
+            </if>
+            <if test="deptName != null">#{deptName},
             </if>
         </trim>
     </insert>
@@ -140,6 +184,24 @@
             <if test="orgid != null">orgid =
                 #{orgid},
             </if>
+            <if test="updateTime != null">update_time =
+                #{updateTime},
+            </if>
+            <if test="url != null">url =
+                #{url},
+            </if>
+            <if test="wardCode != null">ward_code =
+                #{wardCode},
+            </if>
+            <if test="wardName != null">ward_name =
+                #{wardName},
+            </if>
+            <if test="deptCode != null">dept_code =
+                #{deptCode},
+            </if>
+            <if test="deptName != null">dept_name =
+                #{deptName},
+            </if>
         </trim>
         where id = #{id}
     </update>
@@ -167,7 +229,7 @@
         FROM INFORMATION_SCHEMA.TABLES
         WHERE TABLE_NAME = 'service_out_path'
           AND table_schema = DATABASE()
-          and onorgid
+--           and onorgid
     </select>
 
 </mapper>

--
Gitblit v1.9.3