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 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 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 selectList(BizPerson entity); /** sponsor 专属: 通过 sys_user.parent_user_id 过滤主账号归属, INNER JOIN 自然排除游离 person */ List selectSponsorList(BizPerson entity); + /** executor 专属: 同 sponsor, SQL 硬编码 unit_type='executor' (前端绕不开) */ + List 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 selectList(BizPerson entity); /** sponsor 专属: 走 BizPersonMapper.selectSponsorList, 用 sys_user.parent_user_id 做归属过滤 */ List selectSponsorList(BizPerson entity); + /** executor 专属: 同 sponsor, SQL 硬编码 unit_type='executor' (前端绕不开) */ + List 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 selectSponsorList(BizPerson entity) { return bizPersonMapper.selectSponsorList(entity); } + @Override + public List 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 @@ order by p.person_id desc + + + 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 @@