From f142d48409503dfd6b11d7d414c0ee7ffa85eed5 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Wed, 28 Aug 2024 14:28:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
index 13b2dde..abacc04 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
@@ -433,4 +433,10 @@
         WHERE u.id = #{userId}
 
     </select>
+    <select id="queryDept" resultType="cn.gistack.sm.sg.VO.SgAllDeptOrUser">
+        select id,full_name as name from "YWXT"."BLADE_DEPT"
+    </select>
+    <select id="queryUser" resultType="cn.gistack.sm.sg.VO.SgAllDeptOrUser">
+        select id,real_name as name from "YWXT"."BLADE_USER";
+    </select>
 </mapper>

--
Gitblit v1.9.3