From 50c2678ec6453d2b605a5e18feca48179e1212ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E5=BA=86=E6=B3=B0?=
 <12369755+htcloud1@user.noreply.gitee.com>
Date: Tue, 18 Aug 2026 01:42:05 +0800
Subject: [PATCH] =?UTF-8?q?refactor(executor/people):=20=E5=8A=A0=20execut?=
 =?UTF-8?q?orList=20=E5=85=9C=E5=BA=95,=20SQL=20=E7=A1=AC=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=20unit=5Ftype=3D'executor'=20(=E8=B7=9F=20sponsor=20?=
 =?UTF-8?q?=E5=90=8C=E6=A8=A1=E5=BC=8F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- mapper BizPersonMapper.xml 新增 selectExecutorList, SQL 内硬编码 unit_type + parent_user_id=当前主账号
- controller 加 GET /business/person/executorList
- service / mapper 接口同步声明 selectExecutorList
- 前端 api/business/person.js 加 listExecutorPerson
- executor/People.vue 改调 listExecutorPerson, 删 bizList + unitType 参数

效果: executor 端人员列表也走专属接口, 前端传 unitType 绕不开 SQL 兜底
---
 .../controller/BizPersonController.java        | 13 +++++++++++++
 .../ruoyi/business/mapper/BizPersonMapper.java |  2 ++
 .../business/service/IBizPersonService.java    |  2 ++
 .../service/impl/BizPersonServiceImpl.java     |  4 ++++
 .../mapper/business/BizPersonMapper.xml        | 18 ++++++++++++++++++
 ry-vue3/src/api/business/person.js             | 12 ++++++++++++
 ry-vue3/src/views/executor/People.vue          | 11 ++++++-----
 7 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizPersonController.java b/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizPersonController.java
index 5b9318e..bfb2c4c 100644
--- a/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizPersonController.java
+++ b/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizPersonController.java
@@ -79,6 +79,19 @@ public class BizPersonController extends BaseController
         List<BizPerson> list = bizPersonService.selectSponsorList(bizPerson);
         return getDataTable(list);
     }
+
+    /**
+     * executor 端专属人员列表 (同 sponsor: SQL 硬编码 unit_type='executor' + parent_user_id=当前主账号, 前端绕不开)
+     */
+    @GetMapping("/executorList")
+    public TableDataInfo executorList(BizPerson bizPerson)
+    {
+        Long mainUid = getUserId();
+        bizPerson.getParams().put("executorOwnerUid", mainUid);
+        startPage();
+        List<BizPerson> list = bizPersonService.selectExecutorList(bizPerson);
+        return getDataTable(list);
+    }
     @GetMapping("/{personId}")
     public AjaxResult getInfo(@PathVariable("personId") String personId)
     {
diff --git a/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizPersonMapper.java b/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizPersonMapper.java
index 8710397..61ad0fb 100644
--- a/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizPersonMapper.java
+++ b/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizPersonMapper.java
@@ -11,6 +11,8 @@ public interface BizPersonMapper
     List<BizPerson> selectList(BizPerson entity);
     /** sponsor 专属: 通过 sys_user.parent_user_id 过滤主账号归属, INNER JOIN 自然排除游离 person */
     List<BizPerson> selectSponsorList(BizPerson entity);
+    /** executor 专属: 同 sponsor, SQL 硬编码 unit_type='executor' (前端绕不开) */
+    List<BizPerson> selectExecutorList(BizPerson entity);
     int insert(BizPerson entity);
     int updateByPrimaryKey(BizPerson entity);
     int deleteByPrimaryKey(String personId);
diff --git a/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/service/IBizPersonService.java b/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/service/IBizPersonService.java
index d3470d8..31e5758 100644
--- a/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/service/IBizPersonService.java
+++ b/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/service/IBizPersonService.java
@@ -17,6 +17,8 @@ public interface IBizPersonService
     List<BizPerson> selectList(BizPerson entity);
     /** sponsor 专属: 走 BizPersonMapper.selectSponsorList, 用 sys_user.parent_user_id 做归属过滤 */
     List<BizPerson> selectSponsorList(BizPerson entity);
+    /** executor 专属: 同 sponsor, SQL 硬编码 unit_type='executor' (前端绕不开) */
+    List<BizPerson> selectExecutorList(BizPerson entity);
     SysUser insert(BizPerson entity, Long mainUserId);
     int updateByPrimaryKey(BizPerson entity);
     int deleteByPrimaryKey(String personId);
diff --git a/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BizPersonServiceImpl.java b/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BizPersonServiceImpl.java
index 7711024..fb4b490 100644
--- a/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BizPersonServiceImpl.java
+++ b/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BizPersonServiceImpl.java
@@ -35,6 +35,10 @@ public class BizPersonServiceImpl implements IBizPersonService
     public List<BizPerson> selectSponsorList(BizPerson entity)
     { return bizPersonMapper.selectSponsorList(entity); }
 
+    @Override
+    public List<BizPerson> selectExecutorList(BizPerson entity)
+    { return bizPersonMapper.selectExecutorList(entity); }
+
     /**
      * sponsor 端新建人员 = 同时创建 sys_user 子账号 (account_type='SUB', parent_user_id=主账号 user_id)
      * 返回新 SysUser 含 username + 明文 password (前端 toast 显示后即丢)
diff --git a/ry-api/ruoyi-business/src/main/resources/mapper/business/BizPersonMapper.xml b/ry-api/ruoyi-business/src/main/resources/mapper/business/BizPersonMapper.xml
index 7d861b6..8991c61 100644
--- a/ry-api/ruoyi-business/src/main/resources/mapper/business/BizPersonMapper.xml
+++ b/ry-api/ruoyi-business/src/main/resources/mapper/business/BizPersonMapper.xml
@@ -161,4 +161,22 @@
         </where>
         order by p.person_id desc
     </select>
+
+    <!-- executor 专属: 同 sponsor, SQL 硬编码 unit_type='executor' + parent_user_id=当前主账号 (前端绕不开) -->
+    <select id="selectExecutorList" resultMap="BizPersonResult" parameterType="BizPerson">
+        <include refid="selectFieldsWithAccount"/>
+        <where>
+            u.del_flag = '0'
+            and p.unit_type = 'executor'
+            and u.parent_user_id = #{params.executorOwnerUid}
+            <if test="name != null and name != ''"> and p.name = #{name}</if>
+            <if test="phone != null and phone != ''"> and p.phone = #{phone}</if>
+            <if test="orgId != null"> and p.org_id = #{orgId}</if>
+            <if test="department != null and department != ''"> and p.department = #{department}</if>
+            <if test="position != null and position != ''"> and p.position = #{position}</if>
+            <if test="role != null and role != ''"> and p.role = #{role}</if>
+            <if test="status != null and status != ''"> and u.status = #{status}</if>
+        </where>
+        order by p.person_id desc
+    </select>
 </mapper>
diff --git a/ry-vue3/src/api/business/person.js b/ry-vue3/src/api/business/person.js
index c5e7fc7..744ed9a 100644
--- a/ry-vue3/src/api/business/person.js
+++ b/ry-vue3/src/api/business/person.js
@@ -17,3 +17,15 @@ export async function listSponsorPerson(query) {
     total: payload?.total || 0
   }
 }
+
+/**
+ * executor 端专属人员列表 (同 sponsor: SQL 硬编码 unit_type='executor', 前端传 unitType 也绕不开)
+ */
+export async function listExecutorPerson(query) {
+  const { data } = await request({ url: '/business/person/executorList', method: 'get', params: query })
+  const payload = data?.data || data
+  return {
+    rows: payload?.rows || [],
+    total: payload?.total || 0
+  }
+}
diff --git a/ry-vue3/src/views/executor/People.vue b/ry-vue3/src/views/executor/People.vue
index 46bfe64..d9b434c 100644
--- a/ry-vue3/src/views/executor/People.vue
+++ b/ry-vue3/src/views/executor/People.vue
@@ -95,7 +95,8 @@
 <script setup>
 import { ref, reactive, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
-import { bizList, bizUpdate } from '@/api/public'
+import { bizUpdate } from '@/api/public'
+import { listExecutorPerson } from '@/api/business/person'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { translatePersonRole } from '@/utils/roleMap'
 
@@ -113,10 +114,10 @@ const viewOpen = ref(false)
 async function loadList() {
   loading.value = true
   try {
-    // request.js 拦截器已归一化为 {code, msg, data: {total, rows}}, 实际数据在 r.data
-    const r = await bizList('person', { pageNum: page.pageNum, pageSize: page.pageSize, ...q, unitType: 'executor' })
-    list.value = (r.data && r.data.rows) || r.rows || []
-    page.total = (r.data && r.data.total) || r.total || 0
+    // 走 executor 专属接口, SQL 硬编码 unit_type='executor' + parent_user_id=主账号 (前端绕不开)
+    const r = await listExecutorPerson({ pageNum: page.pageNum, pageSize: page.pageSize, ...q })
+    list.value = r.rows || []
+    page.total = r.total || 0
   } finally { loading.value = false }
 }