From 12644c2fb1a477bd5e347afc589edc7b3f428ba7 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Sun, 27 Apr 2025 10:41:20 +0800
Subject: [PATCH] 'commit'

---
 .../base/CompanyUser/Model/CompanyUserModel.java     |  6 +++---
 dsYltBase/src/main/resources/Sql/CompanyUser.sql     | 12 ++++++++++++
 dsYltBase/target/classes/Sql/CompanyUser.sql         | 12 ++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 dsYltBase/src/main/resources/Sql/CompanyUser.sql
 create mode 100644 dsYltBase/target/classes/Sql/CompanyUser.sql

diff --git a/dsYltBase/src/main/java/com/dsideal/base/CompanyUser/Model/CompanyUserModel.java b/dsYltBase/src/main/java/com/dsideal/base/CompanyUser/Model/CompanyUserModel.java
index 97dea634..ce00c3c3 100644
--- a/dsYltBase/src/main/java/com/dsideal/base/CompanyUser/Model/CompanyUserModel.java
+++ b/dsYltBase/src/main/java/com/dsideal/base/CompanyUser/Model/CompanyUserModel.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.dsideal.base.Util.RemoteDbInit;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
+import com.jfinal.plugin.activerecord.SqlPara;
 
 import java.util.List;
 
@@ -17,9 +18,8 @@ public class CompanyUserModel {
      */
     public JSONArray getTreeData() {
         // 1、获取所有父节点
-        String parentSql = "select distinct wx_user_id,wx_person_name from yltcharge.t_ext_company_user where wx_user_id not in (" +
-                "select child_person_id from yltcharge.t_ext_pm_parent) and wx_user_id is not null";
-        List<Record> listParent = Db.find(parentSql);
+        SqlPara sqlPara = Db.getSqlPara("CompanyUser.getMasterPmList");
+        List<Record> listParent = Db.find(sqlPara);
 
         // 2、获取所有子节点
         String childrenSql = "select t1.*,t2.person_name as child_person_name from yltcharge.t_ext_pm_parent as t1 " +
diff --git a/dsYltBase/src/main/resources/Sql/CompanyUser.sql b/dsYltBase/src/main/resources/Sql/CompanyUser.sql
new file mode 100644
index 00000000..c1c35c14
--- /dev/null
+++ b/dsYltBase/src/main/resources/Sql/CompanyUser.sql
@@ -0,0 +1,12 @@
+#namespace("CompanyUser")
+    -- 获取所有项目经理列表
+    #sql("getMasterPmList")
+        select t1.person_id,t2.person_name,t2.telephone from ds_db.t_person_duty_charge as t1
+        inner join ds_db.t_sys_loginperson as t2 on t1.person_id=t2.person_id
+        where t1.duties_id in
+            (select duties_id from ds_db.t_base_principalship_menu where menu_id in (select menu_id from ds_db.t_base_menu where menu_name = '企业用户管理'))
+        and t1.b_use=1
+        and t1.person_id not in (select child_person_id from yltcharge.t_ext_pm_parent)
+        order by t2.person_name
+    #end
+#end
\ No newline at end of file
diff --git a/dsYltBase/target/classes/Sql/CompanyUser.sql b/dsYltBase/target/classes/Sql/CompanyUser.sql
new file mode 100644
index 00000000..c1c35c14
--- /dev/null
+++ b/dsYltBase/target/classes/Sql/CompanyUser.sql
@@ -0,0 +1,12 @@
+#namespace("CompanyUser")
+    -- 获取所有项目经理列表
+    #sql("getMasterPmList")
+        select t1.person_id,t2.person_name,t2.telephone from ds_db.t_person_duty_charge as t1
+        inner join ds_db.t_sys_loginperson as t2 on t1.person_id=t2.person_id
+        where t1.duties_id in
+            (select duties_id from ds_db.t_base_principalship_menu where menu_id in (select menu_id from ds_db.t_base_menu where menu_name = '企业用户管理'))
+        and t1.b_use=1
+        and t1.person_id not in (select child_person_id from yltcharge.t_ext_pm_parent)
+        order by t2.person_name
+    #end
+#end
\ No newline at end of file