From 02609fcedd8fb55383da0a1f823a8cba913510e7 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 26 五月 2025 09:03:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 3f26344..0b65025 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -3072,4 +3072,12 @@
         update  pp.flow_card fc set fc.merge=0
         where fc.process_id = #{processId}
     </update>
+
+    <select id="getProcessName">
+        select IFNULL(nickname,'') from sd.basic_data where basic_category='process' and basic_name=#{processSub}
+    </select>
+
+    <select id="getProcessNameList">
+        SELECT id,basic_name,IFNULL(nickname,"") as nickname FROM sd.`basic_data` where basic_category='process'
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0