feat: 统一角色枚举 (meetingExecutor/supervisor) + 子账号数据隔离 + Login 读取后端 role_type

后端:
- SysUser 加 roleType 字段 (entity + mapper selectUserVo + service 接口/实现)
- SysUserMapper 新增 selectUserIdsByParent (按 parent_user_id 取子账号列表)
- BizPersonController.list 自动注入 MAIN 业务用户可见性: 仅查 user_id IN (子账号列表)
- BizPersonMapper 加 params.subUserIds foreach 过滤
- BizPerson/BizPersonServiceImpl 配合 getParams().put

前端:
- Login.vue 改用后端 sys_user.roleType 替代 username 前缀 autoRole, 修复 exe01 错入 leader 菜单
- utils/roleMap.js 新增: meetingExecutor->会议执行, supervisor->监察员
- executor/People.vue / sponsor/NewPerson.vue / sponsor/Projects.vue / sponsor/SponsorProjects.vue /
  manager/ManagerProjectDetail.vue / manager/{Executor,Sponsor}PersonNew.vue /
  admin/{Executor,Sponsor}PersonNew.vue 全部改为 enum key

SQL:
- migration_unify_role_type_2026_08_16.sql 清洗 biz_person.role 从中文到 enum key

ry-api/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizPersonController.java

@@ -19,6 +19,7 @@ import com.ruoyi.business.mapper.BizOrgMapper;
 import com.ruoyi.business.service.IBizPersonService;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.system.mapper.SysUserMapper;
 
 /**
  * 人员Controller
@@ -32,9 +33,34 @@ public class BizPersonController extends BaseController
 
     @Autowired
     private BizOrgMapper bizOrgMapper;
+
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
+    /**
+     * 业务角色白名单: 这些 roleType 的 MAIN 账号调 /list 会自动按"本机构子账号"隔离
+     * (sys_user.parent_user_id → sys_user.user_id → biz_person.user_id 链路过滤)
+     */
+    private static final java.util.Set<String> BUSINESS_MAIN_ROLES = java.util.Set.of(
+            "executor", "sponsor", "doctor", "manager", "leader"
+    );
+
     @GetMapping("/list")
     public TableDataInfo list(BizPerson bizPerson)
     {
+        // 当前登录用户是 MAIN 业务账号 → 自动注入 subUserIds, 隔离到本主账号的子账号对应人员
+        Long currentUserId = getUserId();
+        SysUser currentUser = currentUserId == null ? null : sysUserMapper.selectUserById(currentUserId);
+        if (currentUser != null
+                && "MAIN".equals(currentUser.getAccountType())
+                && currentUser.getRoleType() != null
+                && BUSINESS_MAIN_ROLES.contains(currentUser.getRoleType())) {
+            List<Long> subUserIds = sysUserMapper.selectUserIdsByParent(currentUserId);
+            // 即使没子账号也强制注入, 避免漏出 sys_user.parent_user_id=NULL 的孤立 person
+            bizPerson.getParams().put("subUserIds", subUserIds == null || subUserIds.isEmpty()
+                    ? java.util.Collections.singletonList(-1L)
+                    : subUserIds);
+        }
         startPage();
         List<BizPerson> list = bizPersonService.selectList(bizPerson);
         return getDataTable(list);
@@ -107,6 +133,33 @@ public class BizPersonController extends BaseController
     @Log(title = "人员批量导入", businessType = BusinessType.INSERT)
     @PostMapping("/sponsorImport")
     public AjaxResult sponsorImport(@RequestParam("file") MultipartFile file) throws Exception
+    {
+        return doImport(file, "sponsor");
+    }
+
+    /**
+     * executor 端批量导入人员 (上传 .xlsx) - 模板列头同 sponsor
+     * orgName 按 orgType='executor' 匹配, unitType 写 executor
+     */
+    @GetMapping("/executorImportTemplate")
+    public void executorImportTemplate(HttpServletResponse response)
+    {
+        ExcelUtil<BizPersonImportVO> util = new ExcelUtil<>(BizPersonImportVO.class);
+        util.importTemplateExcel(response, "人员导入");
+    }
+
+    @Log(title = "人员批量导入", businessType = BusinessType.INSERT)
+    @PostMapping("/executorImport")
+    public AjaxResult executorImport(@RequestParam("file") MultipartFile file) throws Exception
+    {
+        return doImport(file, "executor");
+    }
+
+    /**
+     * 通用人员导入逻辑 (sponsor / executor 共用)
+     * @param unitType 'sponsor' 或 'executor' - 决定 orgName 匹配和 person.unitType 字段
+     */
+    private AjaxResult doImport(MultipartFile file, String unitType) throws Exception
     {
         if (file == null || file.isEmpty()) {
             throw new ServiceException("请选择要上传的文件");
@@ -126,17 +179,18 @@ public class BizPersonController extends BaseController
             r.put("name", row.getName());
             r.put("phone", row.getPhone());
             try {
-                // 1. orgName → orgId (按 orgType='sponsor' 精确匹配, 查不到就报错)
+                // 1. orgName → orgId (按 unitType 精确匹配, 查不到就报错)
                 String orgName = row.getOrgName();
                 if (orgName == null || orgName.trim().isEmpty()) {
                     throw new ServiceException("所属公司不能为空");
                 }
                 BizOrg orgQuery = new BizOrg();
                 orgQuery.setOrgName(orgName.trim());
-                orgQuery.setOrgType("sponsor");
+                orgQuery.setOrgType(unitType);
                 List<BizOrg> matched = bizOrgMapper.selectList(orgQuery);
                 if (matched == null || matched.isEmpty()) {
-                    throw new ServiceException("找不到所属公司: " + orgName + " (需先在 [公司管理] 录入 orgType=sponsor 的公司)");
+                    String label = "sponsor".equals(unitType) ? "支持单位管理" : "服务机构管理";
+                    throw new ServiceException("找不到所属公司: " + orgName + " (需先在 [" + label + "] 录入 orgType=" + unitType + " 的公司)");
                 }
                 Long orgId = matched.get(0).getOrgId();
 
@@ -148,7 +202,7 @@ public class BizPersonController extends BaseController
                 p.setPosition(row.getPosition());
                 p.setRole(row.getRole());
                 p.setStatus("0");    // 默认正常
-                p.setUnitType("sponsor");
+                p.setUnitType(unitType);
                 p.setLoginUsername(row.getPhone());   // 用户名 = 手机号 (要求唯一)
                 p.setLoginPassword("123456");        // 默认密码
                 p.setCreateBy(getUsername());

ry-api/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizPerson.java

@@ -32,11 +32,9 @@ public class BizPerson extends BaseEntity {
     /** role */
     @Excel(name = "role")
     private String role;
-    /** status */
-    @Excel(name = "status")
+    /** 状态 0正常 1禁用 - 跟 sys_user.status 同步, 前端展示请读 sys_user */
+    @Deprecated
     private String status;
-    /** 逻辑删除 0正常 1已删 */
-    private String delFlag;
     /** create_by */
     @Excel(name = "create_by")
     private String createBy;
@@ -60,8 +58,10 @@ public class BizPerson extends BaseEntity {
     /** 主账号ID (来自 sys_user.parent_user_id, 子账号指向其主账号) - 仅展示用 */
     private Long parentUserId;
     /** 子账号登录账号 (前端传入, 用于创建 sys_user 子账号) - 非持久化字段 */
+    @com.fasterxml.jackson.annotation.JsonProperty("userName")
     private transient String loginUsername;
     /** 子账号初始密码 (前端传入, 明文, 创建后不存储明文) - 非持久化字段 */
+    @com.fasterxml.jackson.annotation.JsonProperty("password")
     private transient String loginPassword;
     public String getPersonId() { return personId; }
     public void setPersonId(String personId) { this.personId = personId; }
@@ -83,8 +83,9 @@ public class BizPerson extends BaseEntity {
     public void setRole(String role) { this.role = role; }
     public String getStatus() { return status; }
     public void setStatus(String status) { this.status = status; }
-    public String getDelFlag() { return delFlag; }
-    public void setDelFlag(String delFlag) { this.delFlag = delFlag; }
+    /** 兼容前端调用, 实际读 sys_user.delFlag */
+    public String getDelFlag() { return null; }
+    public void setDelFlag(String delFlag) { /* noop - 跟 sys_user 同步 */ }
     public String getCreateBy() { return createBy; }
     public void setCreateBy(String createBy) { this.createBy = createBy; }
     public Date getCreateTime() { return createTime; }

ry-api/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BizPersonServiceImpl.java

@@ -3,7 +3,9 @@ package com.ruoyi.business.service.impl;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.ruoyi.business.domain.BizOrg;
 import com.ruoyi.business.domain.BizPerson;
+import com.ruoyi.business.mapper.BizOrgMapper;
 import com.ruoyi.business.mapper.BizPersonMapper;
 import com.ruoyi.business.service.IBizPersonService;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -18,6 +20,8 @@ public class BizPersonServiceImpl implements IBizPersonService
     private BizPersonMapper bizPersonMapper;
     @Autowired
     private SysUserMapper sysUserMapper;
+    @Autowired
+    private BizOrgMapper bizOrgMapper;
 
     @Override
     public BizPerson getById(String personId)
@@ -42,6 +46,23 @@ public class BizPersonServiceImpl implements IBizPersonService
         if (exist != null) {
             throw new ServiceException("登录账号已存在");
         }
+
+        // 0.5 兜底: 如果前端没传 orgId, 按 (orgName + unitType) 查 biz_org 回填
+        //     (前端从 org 页面跳来时已带 orgId; 直接访问 new 页面没带 orgId 时走这条路径)
+        if (entity.getOrgId() == null && entity.getOrgName() != null && !entity.getOrgName().isEmpty()
+                && entity.getUnitType() != null && !entity.getUnitType().isEmpty()) {
+            BizOrg q = new BizOrg();
+            q.setOrgName(entity.getOrgName().trim());
+            q.setOrgType(entity.getUnitType());
+            List<BizOrg> matched = bizOrgMapper.selectList(q);
+            if (matched != null && !matched.isEmpty()) {
+                entity.setOrgId(matched.get(0).getOrgId());
+            }
+        }
+        if (entity.getOrgId() == null) {
+            throw new ServiceException("请填写所属公司 (需先在 [支持单位管理/服务机构管理] 录入 orgType=" + entity.getUnitType() + " 的公司)");
+        }
+
         // 1. 创建 sys_user 子账号
         SysUser newUser = new SysUser();
         newUser.setUserName(entity.getLoginUsername());
@@ -67,15 +88,33 @@ public class BizPersonServiceImpl implements IBizPersonService
         return newUser;
     }
 
+    /**
+     * 更新人员: 同时更新 biz_person 业务字段 + 同步更新 sys_user 基础字段
+     * 同步字段: nick_name (业务姓名) / phonenumber (业务手机号) / status (账号启停)
+     * 不同步: password (走独立 updatePwd 接口)
+     */
     @Override
-    public int updateByPrimaryKey(BizPerson entity)
-    { return bizPersonMapper.updateByPrimaryKey(entity); }
+    public int updateByPrimaryKey(BizPerson entity) {
+        int n = bizPersonMapper.updateByPrimaryKey(entity);
+        if (n > 0 && entity.getUserId() != null) {
+            SysUser u = new SysUser();
+            u.setUserId(entity.getUserId());
+            u.setNickName(entity.getName());
+            u.setPhonenumber(entity.getPhone());
+            u.setUpdateBy(SecurityUtils.getUsername());
+            // status 同步 (如果前端传了 status 字段)
+            if (entity.getStatus() != null) {
+                u.setStatus(entity.getStatus());
+            }
+            sysUserMapper.updateUser(u);
+        }
+        return n;
+    }
 
     @Override
     public int deleteByPrimaryKey(String personId)
     {
         int n = bizPersonMapper.deleteByPrimaryKey(personId);
-        if (n > 0) bizPersonMapper.softDeleteSysUserByPersonIds(new String[]{ personId });
         return n;
     }
 
@@ -83,7 +122,6 @@ public class BizPersonServiceImpl implements IBizPersonService
     public int deleteByPrimaryKeys(String[] personIds)
     {
         int n = bizPersonMapper.deleteByPrimaryKeys(personIds);
-        if (n > 0) bizPersonMapper.softDeleteSysUserByPersonIds(personIds);
         return n;
     }
 }

ry-api/ruoyi-business/src/main/resources/mapper/business/BizPersonMapper.xml

@@ -23,16 +23,16 @@
     </resultMap>
 
     <sql id="selectFields">
-        select person_id, name, phone, org_id, department, position, role, unit_type, status, del_flag, user_id, create_by, create_time, update_by, update_time
+        select person_id, name, phone, org_id, department, position, role, unit_type, user_id, create_by, create_time, update_by, update_time
         from biz_person
     </sql>
 
-    <!-- 通用列表: LEFT JOIN biz_org 取公司名/类型, LEFT JOIN sys_user 取账号类型 -->
+    <!-- 通用列表: LEFT JOIN biz_org 取公司名/类型, LEFT JOIN sys_user 取账号状态/类型 -->
     <sql id="selectFieldsWithAccount">
         select p.person_id, p.name, p.phone, p.org_id, o.org_name, o.org_type,
-               p.department, p.position, p.role, p.unit_type, p.status, p.del_flag, p.user_id,
+               p.department, p.position, p.role, p.unit_type, p.user_id,
                p.create_by, p.create_time, p.update_by, p.update_time,
-               u.account_type, u.parent_user_id, u.del_flag as user_del_flag
+               u.account_type, u.parent_user_id, u.status, u.del_flag as user_del_flag
         from biz_person p
         left join biz_org o on p.org_id = o.org_id
         left join sys_user u on p.user_id = u.user_id
@@ -46,7 +46,7 @@
     <select id="selectList" resultMap="BizPersonResult" parameterType="BizPerson">
         <include refid="selectFieldsWithAccount"/>
         <where>
-            p.del_flag = '0'
+            u.del_flag = '0'
             <if test="unitType != null and unitType != ''"> and p.unit_type = #{unitType}</if>
             <if test="name != null and name != ''"> and p.name = #{name}</if>
             <if test="phone != null and phone != ''"> and p.phone = #{phone}</if>
@@ -55,8 +55,15 @@
             <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 p.status = #{status}</if>
+            <if test="status != null and status != ''"> and u.status = #{status}</if>
             <if test="parentUserId != null"> and u.parent_user_id = #{parentUserId}</if>
+            <!-- 业务主账号隔离: biz_person.user_id IN (我的子账号 user_ids) -->
+            <if test="params.subUserIds != null and params.subUserIds.size() > 0">
+                and p.user_id in
+                <foreach collection="params.subUserIds" item="sid" open="(" separator="," close=")">
+                    #{sid}
+                </foreach>
+            </if>
         </where>
         order by p.person_id desc
     </select>
@@ -72,7 +79,6 @@
             <if test="position != null">position,</if>
             <if test="role != null">role,</if>
             <if test="unitType != null">unit_type,</if>
-            <if test="status != null">status,</if>
             <if test="userId != null">user_id,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             create_time,
@@ -88,7 +94,6 @@
             <if test="position != null">#{position},</if>
             <if test="role != null">#{role},</if>
             <if test="unitType != null">#{unitType},</if>
-            <if test="status != null">#{status},</if>
             <if test="userId != null">#{userId},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             sysdate(),
@@ -108,31 +113,32 @@
             <if test="department != null">department = #{department},</if>
             <if test="position != null">position = #{position},</if>
             <if test="role != null">role = #{role},</if>
-            <if test="status != null">status = #{status},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             update_time = sysdate(),
         </trim>
         where person_id = #{personId}
     </update>
 
-    <!-- 逻辑删除: 设 del_flag='1', 同时联动把关联 sys_user 子账号也逻辑删除 -->
+    <!-- 逻辑删除: 改 sys_user.del_flag='1' (biz_person 没这字段, 改用 sys_user 软删) -->
     <update id="deleteByPrimaryKey" parameterType="String">
-        update biz_person set del_flag='1', update_time=sysdate()
-        where person_id = #{personId} and del_flag='0'
+        update sys_user u inner join biz_person p on u.user_id = p.user_id
+            set u.del_flag='1'
+        where p.person_id = #{personId} and u.del_flag='0'
     </update>
     <update id="deleteByPrimaryKeys" parameterType="String">
-        update biz_person set del_flag='1', update_time=sysdate()
-        where del_flag='0' and person_id in
+        update sys_user u inner join biz_person p on u.user_id = p.user_id
+            set u.del_flag='1'
+        where u.del_flag='0' and p.person_id in
         <foreach collection="personIds" item="personId" open="(" separator="," close=")">
             #{personId}
         </foreach>
     </update>
 
-    <!-- 联动: 把 personIds 对应的 sys_user 子账号也逻辑删除 -->
+    <!-- 联动: 把 personIds 对应的 sys_user 子账号也逻辑删除 (兼容保留, 与 deleteByPrimaryKeys 行为一致) -->
     <update id="softDeleteSysUserByPersonIds" parameterType="String">
         update sys_user u inner join biz_person p on u.user_id = p.user_id
             set u.del_flag='1'
-        where u.del_flag='0' and p.del_flag='1' and p.person_id in
+        where u.del_flag='0' and p.person_id in
         <foreach collection="personIds" item="personId" open="(" separator="," close=")">
             #{personId}
         </foreach>
@@ -143,8 +149,7 @@
     <select id="selectSponsorList" resultMap="BizPersonResult" parameterType="BizPerson">
         <include refid="selectFieldsWithAccount"/>
         <where>
-            p.del_flag = '0'
-            and u.del_flag = '0'
+            u.del_flag = '0'
             and p.unit_type = 'sponsor'
             and u.parent_user_id = #{params.sponsorOwnerUid}
             <if test="name != null and name != ''"> and p.name = #{name}</if>
@@ -153,7 +158,7 @@
             <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 p.status = #{status}</if>
+            <if test="status != null and status != ''"> and u.status = #{status}</if>
         </where>
         order by p.person_id desc
     </select>

ry-api/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -86,6 +86,8 @@ public class SysUser extends BaseEntity
    private Long[] postIds;
    /** 角色ID */
    private Long roleId;
+   /** 业务角色 (admin / leader / manager / doctor / executor / sponsor), DB 列 sys_user.role_type */
+   private String roleType;
    public SysUser()
    {
    }
@@ -279,6 +281,14 @@ public class SysUser extends BaseEntity
    {
        this.roleId = roleId;
    }
+   public String getRoleType()
+   {
+       return roleType;
+   }
+   public void setRoleType(String roleType)
+   {
+       this.roleType = roleType;
+   }
    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ry-api/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.domain.vo.SysUserExtendVo;
 
 /**
  * 用户表 数据层
@@ -20,6 +21,14 @@ public interface SysUserMapper
      */
     public List<SysUser> selectUserList(SysUser sysUser);
 
+    /**
+     * 根据条件分页查询用户列表（扩展视图, 附带业务角色 roleType）
+     *
+     * @param vo 查询条件, roleType 非空时按 sys_user.role_type 过滤
+     * @return 用户扩展视图集合
+     */
+    public List<SysUserExtendVo> selectUserExtendList(SysUserExtendVo vo);
+
     /**
      * 根据条件分页查询已配用户角色列表
      * 
@@ -145,4 +154,12 @@ public interface SysUserMapper
      * @return 结果
      */
     public SysUser checkEmailUnique(String email);
+
+    /**
+     * 通过主账号 user_id 查询所有子账号 user_id (sys_user.parent_user_id)
+     *
+     * @param parentUserId 主账号 user_id
+     * @return 子账号 user_id 集合
+     */
+    public List<Long> selectUserIdsByParent(@Param("parentUserId") Long parentUserId);
 }

ry-api/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -3,6 +3,7 @@ package com.ruoyi.system.service;
 import java.util.Date;
 import java.util.List;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.domain.vo.SysUserExtendVo;
 
 /**
  * 用户 业务层
@@ -19,6 +20,14 @@ public interface ISysUserService
      */
     public List<SysUser> selectUserList(SysUser user);
 
+    /**
+     * 根据条件分页查询用户列表(扩展视图, 附带 sys_user.roleType 业务角色)
+     *
+     * @param vo 查询条件
+     * @return 用户扩展视图集合
+     */
+    public List<SysUserExtendVo> selectUserExtendList(SysUserExtendVo vo);
+
     /**
      * 根据条件分页查询已分配用户角色列表
      * 
@@ -214,10 +223,10 @@ public interface ISysUserService
     public boolean isPhoneRegistered(String phone);
 
     /**
-     * 更新 sys_user.role_type (DB 列, entity 无字段)
+     * 更新 sys_user.role_type (业务角色: admin/leader/manager/doctor/executor/sponsor)
      *
      * @param userId 用户ID
-     * @param roleType 角色类型 (admin/leader/manager/doctor/executor/sponsor)
+     * @param roleType 角色类型
      * @return 影响行数
      */
     public int updateRoleType(Long userId, String roleType);

ry-api/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -23,6 +23,7 @@ import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.system.domain.SysPost;
 import com.ruoyi.system.domain.SysUserPost;
 import com.ruoyi.system.domain.SysUserRole;
+import com.ruoyi.system.domain.vo.SysUserExtendVo;
 import com.ruoyi.system.mapper.SysPostMapper;
 import com.ruoyi.system.mapper.SysRoleMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
@@ -79,6 +80,19 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectUserList(user);
     }
 
+    /**
+     * 根据条件分页查询用户列表(扩展视图, 附带 sys_user.roleType 业务角色)
+     *
+     * @param vo 查询条件
+     * @return 用户扩展视图集合
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public List<SysUserExtendVo> selectUserExtendList(SysUserExtendVo vo)
+    {
+        return userMapper.selectUserExtendList(vo);
+    }
+
     /**
      * 根据条件分页查询已分配用户角色列表
      * 

ry-api/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nickName"      column="nick_name"       />
         <result property="accountType"  column="account_type"    />
         <result property="parentUserId" column="parent_user_id"  />
+        <result property="roleType"     column="role_type"       />
         <result property="email"         column="email"           />
         <result property="phonenumber"   column="phonenumber"     />
         <result property="sex"           column="sex"             />
@@ -49,8 +50,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status"       column="role_status"    />
     </resultMap>
 
+    <!-- 用户扩展视图 resultMap: 继承 SysUserResult, 附加 sys_user.role_type 业务角色 -->
+    <resultMap type="SysUserExtendVo" id="SysUserExtendResult" extends="SysUserResult">
+        <result property="roleType" column="u_role_type" />
+    </resultMap>
+	
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.account_type, u.parent_user_id, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.update_by, u.update_time, u.remark, 
+        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.account_type, u.parent_user_id, u.role_type, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.update_by, u.update_time, u.remark, 
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
@@ -88,6 +94,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		${params.dataScope}
 	</select>
 
+	<!--
+		用户列表扩展查询: 业务角色从 sys_user.role_type 直接读 (2026-08-16 重构, 删 biz_user_role_bind)
+	-->
+	<select id="selectUserExtendList" parameterType="SysUserExtendVo" resultMap="SysUserExtendResult">
+		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.update_by, u.update_time, u.remark, d.dept_name, d.leader,
+		       u.role_type as u_role_type
+		from sys_user u
+		left join sys_dept d on u.dept_id = d.dept_id
+		where u.del_flag = '0'
+		<if test="userId != null and userId != 0">
+			AND u.user_id = #{userId}
+		</if>
+		<if test="userName != null and userName != ''">
+			AND u.user_name like concat('%', #{userName}, '%')
+		</if>
+		<if test="status != null and status != ''">
+			AND u.status = #{status}
+		</if>
+		<if test="phonenumber != null and phonenumber != ''">
+			AND u.phonenumber like concat('%', #{phonenumber}, '%')
+		</if>
+		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+			AND date_format(u.create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
+		</if>
+		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+			AND date_format(u.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
+		</if>
+		<if test="deptId != null and deptId != 0">
+			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
+		</if>
+		<if test="roleType != null and roleType != ''"><!-- 业务角色过滤 -->
+			AND u.role_type = #{roleType}
+		</if>
+		<!-- 数据范围过滤 -->
+		${params.dataScope}
+	</select>
+	
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
@@ -194,6 +237,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
  			<if test="password != null and password != ''">password = #{password},</if>
  			<if test="status != null and status != ''">status = #{status},</if>
+ 			<if test="roleType != null and roleType != ''">role_type = #{roleType},</if>
  			<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
  			<if test="loginDate != null">login_date = #{loginDate},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
@@ -234,4 +278,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
  	</delete>
 
+	<!--
+		通过主账号 user_id 查询所有子账号 user_id (sys_user.parent_user_id)
+		用于 biz_person 列表按"主账号隔离"过滤
+	-->
+	<select id="selectUserIdsByParent" resultType="java.lang.Long">
+		select user_id from sys_user where parent_user_id = #{parentUserId} and del_flag = '0'
+	</select>
+
 </mapper> 

ry-vue3/src/utils/roleMap.js

@@ -0,0 +1,23 @@
+/**
+ * biz_person.role enum key → 中文 label 翻译
+ * 跟 sys_user.role_type 模式一致: DB 存 enum key, UI 显示中文
+ *
+ * 适用场景:
+ *  - executor/People.vue 列表/详情显示 role
+ *  - 各处 NewPerson 表单 el-option (label=中文, value=key)
+ *  - 查询条件 role=key
+ */
+export const PERSON_ROLE_LABEL = {
+  meetingExecutor: '会议执行',
+  supervisor: '监察员'
+}
+
+/**
+ * 翻译 biz_person.role enum key → 中文 label
+ * @param {string} key
+ * @returns {string} 没匹配到时返回原 key, 避免显示 'undefined'
+ */
+export function translatePersonRole(key) {
+  if (!key) return ''
+  return PERSON_ROLE_LABEL[key] || key
+}

ry-vue3/src/views/admin/ExecutorPersonNew.vue

@@ -0,0 +1,173 @@
+<template>
+  <!--
+    角色: 🟦 后台 服务机构下人员 新建/编辑 (admin/executor-people/new, admin/executor-people/edit/:id)
+    结构对齐 admin/ExpertNew.vue
+    unitType 硬编码 'executor'
+    角色固定为「会议执行」(执行方子类型, 暂唯一)
+  -->
+  <div class="page-card admin-executor-person-new">
+    <div class="breadcrumb">
+      <a @click="goBack">服务机构下人员</a> &gt; {{ isEdit ? '编辑人员' : '新建人员' }}{{ orgName ? ' (' + orgName + ')' : '' }}
+    </div>
+
+    <el-card v-loading="loadingDetail" shadow="never" class="form-card nested">
+      <el-form :model="form" :rules="rules" ref="formRef" label-width="100px">
+        <el-form-item label="用户名" prop="userName">
+          <el-input v-model="form.userName" placeholder="登录用户名" maxlength="50" :disabled="isEdit" />
+        </el-form-item>
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="form.name" placeholder="姓名" maxlength="20" />
+        </el-form-item>
+        <el-form-item label="手机号" prop="phone">
+          <el-input v-model="form.phone" placeholder="手机号" maxlength="11" />
+        </el-form-item>
+        <el-form-item label="所属公司" prop="orgName">
+          <el-input v-model="form.orgName" placeholder="所属公司" maxlength="200" :disabled="!!orgId" />
+        </el-form-item>
+        <el-form-item label="部门">
+          <el-input v-model="form.department" placeholder="部门" maxlength="50" />
+        </el-form-item>
+        <el-form-item label="职务">
+          <el-input v-model="form.position" placeholder="职务" maxlength="50" />
+        </el-form-item>
+        <el-form-item label="角色">
+          <span style="color:#303133">会议执行 <span style="color:#909399;font-size:12px">(执行方人员固定, 暂唯一子类型)</span></span>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <div class="form-actions">
+      <el-button type="primary" :loading="saving" @click="onSave">保存</el-button>
+      <el-button @click="confirmCancel">取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { reactive, ref, computed, onMounted } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { bizAdd, bizUpdate, bizGet } from '@/api/public'
+
+const router = useRouter()
+const route = useRoute()
+
+const formRef = ref(null)
+const saving = ref(false)
+const loadingDetail = ref(false)
+const isEdit = !!route.params.id
+const personId = route.params.id || null
+
+const orgName = computed(() => route.query.orgName || '')
+const orgId = computed(() => route.query.orgId ? Number(route.query.orgId) : null)
+
+const form = reactive({
+  personId: null,
+  userName: '',
+  name: '',
+  phone: '',
+  orgName: '',
+  department: '',
+  position: ''
+})
+
+const rules = {
+  userName: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
+  name:     [{ required: true, message: '请输入姓名',   trigger: 'blur' }],
+  phone: [
+    { required: true, message: '请输入手机号', trigger: 'blur' },
+    { pattern: /^1\d{10}$/, message: '手机号格式错误', trigger: 'blur' }
+  ],
+  orgName:  [{ required: true, message: '请输入所属公司', trigger: 'blur' }]
+}
+
+function goBack() {
+  router.push('/admin/executor-people')
+}
+
+async function loadDetail() {
+  if (!personId) return
+  loadingDetail.value = true
+  try {
+    const res = await bizGet('person', personId)
+    if (res?.code === 200 && res.data) {
+      const d = res.data
+      Object.assign(form, {
+        personId: d.personId,
+        userName: d.userName || '',
+        name: d.name || '',
+        phone: d.phone || '',
+        orgName: d.orgName || '',
+        department: d.department || '',
+        position: d.position || ''
+      })
+    } else {
+      ElMessage.error(res?.msg || '加载失败')
+      goBack()
+    }
+  } catch (e) {
+    ElMessage.error(e?.msg || e?.message || '加载失败')
+    goBack()
+  } finally {
+    loadingDetail.value = false
+  }
+}
+
+function confirmCancel() {
+  const hasContent = form.name || form.phone || form.userName || form.orgName
+  if (!isEdit && !hasContent) { goBack(); return }
+  ElMessageBox.confirm('确定取消?未保存的内容将丢失', '提示', { type: 'warning' })
+    .then(() => goBack())
+    .catch(() => {})
+}
+
+async function onSave() {
+  try { await formRef.value.validate() } catch { return }
+  saving.value = true
+  try {
+    const payload = { ...form, unitType: 'executor', role: 'meetingExecutor' }
+    if (!isEdit && orgId.value) payload.orgId = orgId.value
+    if (isEdit) {
+      delete payload.personId
+      await bizUpdate('person', payload)
+      ElMessage.success('修改成功')
+    } else {
+      payload.status = '0'
+      payload.password = '123456'   // @JsonProperty("password") → loginPassword
+      await bizAdd('person', payload)
+      ElMessage.success('新建成功,默认密码 123456')
+    }
+    goBack()
+  } catch (e) {
+    ElMessage.error(e?.msg || e?.message || '保存失败')
+  } finally {
+    saving.value = false
+  }
+}
+
+onMounted(() => {
+  // 预填 orgName (从 org 页面跳来时)
+  if (!isEdit && orgName.value && !form.orgName) {
+    form.orgName = orgName.value
+  }
+  if (isEdit) loadDetail()
+})
+</script>
+
+<style scoped>
+.admin-executor-person-new { max-width: 1000px; }
+.page-card { background: #fff; padding: 16px 20px; border-radius: 6px; border: 1px solid #f0f0f0; }
+.breadcrumb { font-size: 13px; color: #8c8c8c; margin-bottom: 16px; }
+.breadcrumb a { color: var(--brand-primary); cursor: pointer; text-decoration: none; }
+.breadcrumb a:hover { color: var(--brand-primary-deep, var(--brand-primary)); }
+
+.form-card.nested { background: transparent; border: none; box-shadow: none; }
+:deep(.form-card .el-card__body) { padding: 24px 28px; }
+
+.form-actions { margin-top: 16px; display: flex; gap: 8px; }
+
+:deep(.el-button--primary) { background: var(--brand-primary); border-color: var(--brand-primary); border-radius: 4px; }
+:deep(.el-button--primary:hover) { background: var(--brand-primary-deep, var(--brand-primary)); border-color: var(--brand-primary-deep, var(--brand-primary)); }
+:deep(.el-button) { border-radius: 4px; }
+:deep(.el-input__wrapper) { border-radius: 4px; }
+</style>

ry-vue3/src/views/admin/SponsorPersonNew.vue

@@ -0,0 +1,173 @@
+<template>
+  <!--
+    角色: 🟦 后台 支持单位下人员 新建/编辑 (admin/sponsor-people/new, admin/sponsor-people/edit/:id)
+    结构对齐 admin/ExpertNew.vue
+    unitType 硬编码 'sponsor'
+  -->
+  <div class="page-card admin-sponsor-person-new">
+    <div class="breadcrumb">
+      <a @click="goBack">支持单位下人员</a> &gt; {{ isEdit ? '编辑人员' : '新建人员' }}{{ orgName ? ' (' + orgName + ')' : '' }}
+    </div>
+
+    <el-card v-loading="loadingDetail" shadow="never" class="form-card nested">
+      <el-form :model="form" :rules="rules" ref="formRef" label-width="100px">
+        <el-form-item label="用户名" prop="userName">
+          <el-input v-model="form.userName" placeholder="登录用户名" maxlength="50" :disabled="isEdit" />
+        </el-form-item>
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="form.name" placeholder="姓名" maxlength="20" />
+        </el-form-item>
+        <el-form-item label="手机号" prop="phone">
+          <el-input v-model="form.phone" placeholder="手机号 (与用户名一致时可重复)" maxlength="11" />
+        </el-form-item>
+        <el-form-item label="所属公司" prop="orgName">
+          <el-input v-model="form.orgName" placeholder="所属公司" maxlength="200" :disabled="!!orgId" />
+        </el-form-item>
+        <el-form-item label="部门">
+          <el-input v-model="form.department" placeholder="部门" maxlength="50" />
+        </el-form-item>
+        <el-form-item label="职务">
+          <el-input v-model="form.position" placeholder="职务" maxlength="50" />
+        </el-form-item>
+        <el-form-item label="角色">
+          <span style="color:#303133">监察员 <span style="color:#909399;font-size:12px">(赞助方人员固定)</span></span>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <div class="form-actions">
+      <el-button type="primary" :loading="saving" @click="onSave">保存</el-button>
+      <el-button @click="confirmCancel">取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { reactive, ref, computed, onMounted } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { bizAdd, bizUpdate, bizGet } from '@/api/public'
+
+const router = useRouter()
+const route = useRoute()
+
+const formRef = ref(null)
+const saving = ref(false)
+const loadingDetail = ref(false)
+const isEdit = !!route.params.id
+const personId = route.params.id || null
+
+const orgName = computed(() => route.query.orgName || '')
+const orgId = computed(() => route.query.orgId ? Number(route.query.orgId) : null)
+
+const form = reactive({
+  personId: null,
+  userName: '',
+  name: '',
+  phone: '',
+  orgName: '',
+  department: '',
+  position: ''
+})
+
+const rules = {
+  userName: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
+  name:     [{ required: true, message: '请输入姓名',   trigger: 'blur' }],
+  phone: [
+    { required: true, message: '请输入手机号', trigger: 'blur' },
+    { pattern: /^1\d{10}$/, message: '手机号格式错误', trigger: 'blur' }
+  ],
+  orgName:  [{ required: true, message: '请输入所属公司', trigger: 'blur' }]
+}
+
+function goBack() {
+  router.push('/admin/sponsor-people')
+}
+
+async function loadDetail() {
+  if (!personId) return
+  loadingDetail.value = true
+  try {
+    const res = await bizGet('person', personId)
+    if (res?.code === 200 && res.data) {
+      const d = res.data
+      Object.assign(form, {
+        personId: d.personId,
+        userName: d.userName || '',
+        name: d.name || '',
+        phone: d.phone || '',
+        orgName: d.orgName || '',
+        department: d.department || '',
+        position: d.position || ''
+      })
+    } else {
+      ElMessage.error(res?.msg || '加载失败')
+      goBack()
+    }
+  } catch (e) {
+    ElMessage.error(e?.msg || e?.message || '加载失败')
+    goBack()
+  } finally {
+    loadingDetail.value = false
+  }
+}
+
+function confirmCancel() {
+  const hasContent = form.name || form.phone || form.userName || form.orgName
+  if (!isEdit && !hasContent) { goBack(); return }
+  ElMessageBox.confirm('确定取消?未保存的内容将丢失', '提示', { type: 'warning' })
+    .then(() => goBack())
+    .catch(() => {})
+}
+
+async function onSave() {
+  try { await formRef.value.validate() } catch { return }
+  saving.value = true
+  try {
+    const payload = { ...form, unitType: 'sponsor', role: 'supervisor' }
+    // 从 org 页面跳来时 route.query 带 orgId, 直接作为 FK
+    if (!isEdit && orgId.value) payload.orgId = orgId.value
+    if (isEdit) {
+      delete payload.personId
+      await bizUpdate('person', payload)
+      ElMessage.success('修改成功')
+    } else {
+      payload.status = '0'
+      payload.password = '123456'   // @JsonProperty("password") → loginPassword
+      await bizAdd('person', payload)
+      ElMessage.success('新建成功,默认密码 123456')
+    }
+    goBack()
+  } catch (e) {
+    ElMessage.error(e?.msg || e?.message || '保存失败')
+  } finally {
+    saving.value = false
+  }
+}
+
+onMounted(() => {
+  // 预填 orgName (从 org 页面跳来时)
+  if (!isEdit && orgName.value && !form.orgName) {
+    form.orgName = orgName.value
+  }
+  if (isEdit) loadDetail()
+})
+</script>
+
+<style scoped>
+.admin-sponsor-person-new { max-width: 1000px; }
+.page-card { background: #fff; padding: 16px 20px; border-radius: 6px; border: 1px solid #f0f0f0; }
+.breadcrumb { font-size: 13px; color: #8c8c8c; margin-bottom: 16px; }
+.breadcrumb a { color: var(--brand-primary); cursor: pointer; text-decoration: none; }
+.breadcrumb a:hover { color: var(--brand-primary-deep, var(--brand-primary)); }
+
+.form-card.nested { background: transparent; border: none; box-shadow: none; }
+:deep(.form-card .el-card__body) { padding: 24px 28px; }
+
+.form-actions { margin-top: 16px; display: flex; gap: 8px; }
+
+:deep(.el-button--primary) { background: var(--brand-primary); border-color: var(--brand-primary); border-radius: 4px; }
+:deep(.el-button--primary:hover) { background: var(--brand-primary-deep, var(--brand-primary)); border-color: var(--brand-primary-deep, var(--brand-primary)); }
+:deep(.el-button) { border-radius: 4px; }
+:deep(.el-input__wrapper) { border-radius: 4px; }
+</style>

ry-vue3/src/views/auth/Login.vue

@@ -154,12 +154,15 @@ async function onSubmit() {
   loading.value = true
   try {
     const res = await login({ username: form.username, password: form.password, code: form.code || '', uuid: form.uuid || '' })
-    const role = autoRole(form.username)
+    // username 推断仅作兜底, 真实 role 以 /getInfo 返回的 sys_user.role_type 为准
+    const fallbackRole = autoRole(form.username)
     userStore.setToken(res.token)
-    // /login 接口只返回 token; 调 /getInfo 拿完整 user (含 accountType/parentUserId, 让 isMain/isSub 判断正确)
+    // /login 接口只返回 token; 调 /getInfo 拿完整 user (含 accountType/parentUserId/roleType, 让 isMain/isSub/role 都从后端真实值取)
+    let role = fallbackRole
     try {
       const info = await getInfo()
       const u = info.user || {}
+      role = u.roleType || fallbackRole
       userStore.setUser({
         userId: u.userId,
         userName: u.userName || form.username,
@@ -176,13 +179,13 @@ async function onSubmit() {
         nickName: form.username,
         accountType: 'MAIN',
         parentUserId: null,
-        role
+        role: fallbackRole
       })
     }
     ElMessage.success(`欢迎，${form.username}（${userTypes.find(u => u.value === role)?.name || role}）`)
     router.replace(roleHome[role] || '/leader/home')
   } catch (e) {
-    ElMessage.error(e?.msg || '登录失败')
+    // 错误提示已由 utils/request.js 拦截器统一弹 (ElMessage.error), 这里只刷新验证码
     loadCaptcha()
   } finally {
     loading.value = false

ry-vue3/src/views/executor/NewPerson.vue

@@ -0,0 +1,174 @@
+<template>
+  <!--
+    角色: 🟨 执行方 新建/编辑人员 (executor/people/new, executor/people/edit/:id)
+    结构 1:1 对齐 proto new-person.html (但用 page-card 整页包裹, 不用 main.content):
+      page-card (整页面板)
+        page-header (标题区: h1 + 副标题)
+          h1.page-title
+          p.page-sub
+        el-form.card
+          7 字段 form-row
+          form-actions (保存/取消)
+  -->
+  <div class="page-card new-person">
+    <!-- 面包屑 -->
+    <div class="breadcrumb">
+      <a href="javascript:void(0)" @click="goHome">首页</a>
+      <span class="sep">/</span>
+      <a href="javascript:void(0)" @click="goBack">人员管理</a>
+      <span class="sep">/</span>
+      <span>{{ isEdit ? '编辑人员' : '新建人员' }}</span>
+    </div>
+
+    <!-- 表单 (1 个 page-card 内, 无大标题) -->
+    <el-form ref="formRef" :model="form" :rules="rules" class="person-form" label-width="100px">
+      <el-form-item label="用户名" prop="userName">
+        <el-input v-model="form.userName" placeholder="请输入登录用户名" maxlength="50" />
+      </el-form-item>
+      <el-form-item label="姓名" prop="name">
+        <el-input v-model="form.name" placeholder="请输入姓名" maxlength="20" />
+      </el-form-item>
+
+      <el-form-item label="手机号" prop="phone">
+        <el-input v-model="form.phone" placeholder="请输入手机号" maxlength="11" />
+      </el-form-item>
+
+      <el-form-item label="所属公司" prop="orgName">
+        <el-input v-model="form.orgName" placeholder="请输入所属公司" maxlength="200" />
+      </el-form-item>
+
+      <el-form-item label="部门" prop="department">
+        <el-input v-model="form.department" placeholder="请输入部门" maxlength="50" />
+      </el-form-item>
+
+      <el-form-item label="职务" prop="position">
+        <el-input v-model="form.position" placeholder="请输入职务" maxlength="50" />
+      </el-form-item>
+
+      <el-form-item label="角色" prop="role">
+        <el-select v-model="form.role" placeholder="请选择角色" style="width:100%">
+          <el-option label="会议执行" value="meetingExecutor" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="form.status" placeholder="请选择" style="width:100%">
+          <el-option label="正常" value="1" />
+          <el-option label="禁用" value="0" />
+        </el-select>
+      </el-form-item>
+
+      <!-- 按钮区 (在表单内底部) -->
+      <div class="form-actions">
+        <el-button type="primary" :loading="saving" @click="onSave">保存</el-button>
+        <el-button @click="goBack">取消</el-button>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, computed, onMounted } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { bizGet, bizAdd, bizUpdate } from '@/api/public'
+import { ElMessage } from 'element-plus'
+
+const route = useRoute()
+const router = useRouter()
+
+const isEdit = computed(() => !!route.params.id)
+const personId = computed(() => route.params.id || null)
+
+const formRef = ref()
+const saving = ref(false)
+const form = reactive({
+  userName: '',
+  name: '',
+  phone: '',
+  orgName: '',
+  department: '',
+  position: '',
+  role: 'meetingExecutor',
+  status: '1',
+  unitType: 'executor'
+})
+
+const rules = {
+  userName:   [{ required: true, message: '请输入用户名',   trigger: 'blur' }],
+  name:       [{ required: true, message: '请输入姓名',     trigger: 'blur' }],
+  phone: [
+    { required: true, message: '请输入手机号', trigger: 'blur' },
+    { pattern: /^1\d{10}$/, message: '手机号格式错误', trigger: 'blur' }
+  ],
+  orgName:    [{ required: true, message: '请输入所属公司', trigger: 'blur' }],
+  department: [{ required: true, message: '请输入部门',     trigger: 'blur' }],
+  position:   [{ required: true, message: '请输入职务',     trigger: 'blur' }],
+  role:       [{ required: true, message: '请选择角色',     trigger: 'change' }],
+  status:     [{ required: true, message: '请选择状态',     trigger: 'change' }]
+}
+
+async function loadDetail() {
+  if (!isEdit.value) return
+  try {
+    const r = await bizGet('person', personId.value)
+    Object.assign(form, r.data || {})
+    form.status = String(form.status)
+  } catch (e) {
+    ElMessage.error('加载人员详情失败')
+    goBack()
+  }
+}
+
+async function onSave() {
+  try { await formRef.value.validate() } catch { return }
+  saving.value = true
+  try {
+    const payload = { ...form, unitType: 'executor' }
+    if (isEdit.value) {
+      await bizUpdate('person', { personId: personId.value, ...payload })
+      ElMessage.success('修改成功')
+    } else {
+      await bizAdd('person', payload)
+      ElMessage.success('新建成功')
+    }
+    goBack()
+  } catch (e) {
+    ElMessage.error(e?.msg || '保存失败')
+  } finally {
+    saving.value = false
+  }
+}
+
+function goBack() { router.push('/executor/people') }
+
+function goHome() {
+  try { if (window.parent && window.parent.goHome) window.parent.goHome() } catch (e) {}
+  router.push('/executor/overview')
+}
+
+onMounted(loadDetail)
+</script>
+
+<style scoped>
+/* 整页面板 (与 People.vue 风格一致) */
+.executor-new-person { padding: 16px; }
+.breadcrumb { font-size: 13px; color: #8c8c8c; margin-bottom: 20px; }
+.breadcrumb a { color: var(--brand-primary); text-decoration: none; cursor: pointer; }
+.breadcrumb a:hover { text-decoration: underline; }
+.breadcrumb .sep { margin: 0 6px; color: #bfbfbf; }
+
+/* 表单 */
+.person-form { max-width: 720px; }
+.person-form :deep(.el-form-item) { margin-bottom: 18px; }
+.person-form :deep(.el-form-item__label) { font-size: 14px; color: #595959; }
+
+/* 按钮区 */
+.form-actions {
+  display: flex;
+  gap: 12px;
+  justify-content: center;
+  margin-top: 32px;
+  padding-top: 20px;
+  border-top: 1px solid #f0f0f0;
+}
+</style>

ry-vue3/src/views/executor/People.vue

@@ -17,7 +17,7 @@
 
     <!-- ========== 批量按钮 (top=203: 新建人员 / 批量导入) ========== -->
     <div class="batch-bar">
-      <el-button type="primary" @click="openAdd">新建人员</el-button>
+      <el-button type="primary" @click="goNew">新建人员</el-button>
       <el-button @click="importOpen = true">批量导入</el-button>
       <span class="filter-tip">*批量导入模板与列表表项一致</span>
     </div>
@@ -31,7 +31,7 @@
       <el-table-column prop="position" label="职务" min-width="100" />
       <el-table-column prop="role" label="角色" width="100">
         <template #default="{ row }">
-          <el-tag size="small" :type="row.role === '管理员' ? 'warning' : 'info'">{{ row.role || '监察员' }}</el-tag>
+          <el-tag size="small" :type="row.role === 'meetingExecutor' ? 'warning' : 'info'">{{ translatePersonRole(row.role) }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column prop="status" label="状态" width="100">
@@ -42,7 +42,7 @@
       <el-table-column label="操作" width="220" fixed="right">
         <template #default="{ row }">
           <el-button size="small" link type="primary" @click="onView(row)">查看</el-button>
-          <el-button size="small" link type="primary" @click="onEdit(row)">编辑</el-button>
+          <el-button size="small" link type="primary" @click="goEdit(row)">编辑</el-button>
           <el-button v-if="(row.status || '正常') === '正常'" size="small" link type="danger" @click="onToggleStatus(row, '禁用')">禁用</el-button>
           <el-button v-else size="small" link type="success" @click="onToggleStatus(row, '恢复')">恢复</el-button>
         </template>
@@ -54,29 +54,8 @@
                      @current-change="loadList" @size-change="loadList" />
     </div>
 
-    <!-- ========== Dialog: 新增/编辑 ========== -->
-    <el-dialog v-model="formOpen" :title="form._id ? '编辑人员' : '新增人员'" width="520px">
-      <el-form :model="form" label-width="100px">
-        <el-form-item label="姓名"><el-input v-model="form.name" /></el-form-item>
-        <el-form-item label="手机号"><el-input v-model="form.phone" /></el-form-item>
-        <el-form-item label="所属公司">
-          <el-input v-model="form.orgName" placeholder="所属公司 (TODO: 改 biz_org 下拉)" />
-        </el-form-item>
-        <el-form-item label="部门"><el-input v-model="form.department" /></el-form-item>
-        <el-form-item label="职务"><el-input v-model="form.position" /></el-form-item>
-        <el-form-item label="角色">
-          <el-select v-model="form.role" style="width:100%" :disabled="userRole === '管理员'">
-            <el-option label="管理员" value="管理员" />
-            <el-option label="监察员" value="监察员" />
-          </el-select>
-          <span class="filter-tip">*新建时，管理员只能新建监察员</span>
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <el-button @click="formOpen = false">取消</el-button>
-        <el-button type="primary" @click="save">保存</el-button>
-      </template>
-    </el-dialog>
+    <!-- 新增/编辑: 跳转独立页面 /executor/people/new 或 /edit/:id, 不再是 dialog -->
+    <!-- (旧的 formOpen dialog 已删) -->
 
     <!-- ========== Dialog: 批量导入 ========== -->
     <el-dialog v-model="importOpen" title="批量导入" width="520px">
@@ -105,7 +84,7 @@
         <el-descriptions-item label="所属公司" :span="2">{{ view.orgName }}</el-descriptions-item>
         <el-descriptions-item label="部门">{{ view.department }}</el-descriptions-item>
         <el-descriptions-item label="职务">{{ view.position }}</el-descriptions-item>
-        <el-descriptions-item label="角色">{{ view.role || '监察员' }}</el-descriptions-item>
+        <el-descriptions-item label="角色">{{ translatePersonRole(view.role) }}</el-descriptions-item>
         <el-descriptions-item label="状态">{{ view.status || '正常' }}</el-descriptions-item>
       </el-descriptions>
       <template #footer><el-button @click="viewOpen = false">关闭</el-button></template>
@@ -115,18 +94,18 @@
 
 <script setup>
 import { ref, reactive, onMounted } from 'vue'
-import { bizList, bizAdd, bizUpdate } from '@/api/public'
+import { useRouter } from 'vue-router'
+import { bizList, bizUpdate } from '@/api/public'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { translatePersonRole } from '@/utils/roleMap'
 
-const userRole = '监察员'  // 简化: 默认监察员
+const router = useRouter()
 
 const list = ref([])
 const loading = ref(false)
 const q = reactive({ name: '', phone: '', orgName: '', department: '', position: '' })
 const page = reactive({ pageNum: 1, pageSize: 10, total: 0 })
 
-const formOpen = ref(false)
-const form = reactive({ _id: '', name: '', phone: '', orgName: '', department: '', position: '', role: '监察员' })
 const importOpen = ref(false)
 const view = ref({})
 const viewOpen = ref(false)
@@ -134,37 +113,21 @@ const viewOpen = ref(false)
 async function loadList() {
   loading.value = true
   try {
-    const r = await bizList('person', { pageNum: page.pageNum, pageSize: page.pageSize, ...q })
-    list.value = r.rows || []
-    page.total = r.total || 0
+    // 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
   } finally { loading.value = false }
 }
 
 function reset() { Object.assign(q, { name:'',phone:'',orgName:'',department:'',position:'' }); page.pageNum = 1; loadList() }
 
-function openAdd() {
-  Object.assign(form, { _id:'', name:'', phone:'', orgName:'', department:'', position:'', role: '监察员' })
-  formOpen.value = true
-}
+// 新建/编辑走独立页面
+function goNew() { router.push('/executor/people/new') }
+function goEdit(row) { router.push(`/executor/people/edit/${row.personId}`) }
 
 function onView(row) { view.value = row; viewOpen.value = true }
 
-function onEdit(row) {
-  Object.assign(form, { _id: row.personId, name:row.name, phone:row.phone, orgName:row.orgName, department:row.department, position:row.position, role: row.role || '监察员' })
-  formOpen.value = true
-}
-
-async function save() {
-  if (!form.name) { ElMessage.error('请填写姓名'); return }
-  try {
-    if (form._id) await bizUpdate('person', { personId: form._id, ...form })
-    else await bizAdd('person', { ...form })
-    ElMessage.success('保存成功')
-    formOpen.value = false
-    loadList()
-  } catch (e) { ElMessage.error(e?.msg || '保存失败') }
-}
-
 async function onToggleStatus(row, action) {
   try {
     await ElMessageBox.confirm(`确定${action}「${row.name}」吗?`, action, { type: 'warning' })

ry-vue3/src/views/manager/ExecutorPersonNew.vue

@@ -0,0 +1,173 @@
+<template>
+  <!--
+    角色: 🟨 合规 服务机构下人员 新建/编辑 (manager/executor-people/new, manager/executor-people/edit/:id)
+    结构对齐 admin/ExpertNew.vue
+    unitType 硬编码 'executor'
+    角色固定为「会议执行」(执行方子类型, 暂唯一)
+  -->
+  <div class="page-card manager-executor-person-new">
+    <div class="breadcrumb">
+      <a @click="goBack">服务机构下人员</a> &gt; {{ isEdit ? '编辑人员' : '新建人员' }}{{ orgName ? ' (' + orgName + ')' : '' }}
+    </div>
+
+    <el-card v-loading="loadingDetail" shadow="never" class="form-card nested">
+      <el-form :model="form" :rules="rules" ref="formRef" label-width="100px">
+        <el-form-item label="用户名" prop="userName">
+          <el-input v-model="form.userName" placeholder="登录用户名" maxlength="50" :disabled="isEdit" />
+        </el-form-item>
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="form.name" placeholder="姓名" maxlength="20" />
+        </el-form-item>
+        <el-form-item label="手机号" prop="phone">
+          <el-input v-model="form.phone" placeholder="手机号" maxlength="11" />
+        </el-form-item>
+        <el-form-item label="所属公司" prop="orgName">
+          <el-input v-model="form.orgName" placeholder="所属公司" maxlength="200" :disabled="!!orgId" />
+        </el-form-item>
+        <el-form-item label="部门">
+          <el-input v-model="form.department" placeholder="部门" maxlength="50" />
+        </el-form-item>
+        <el-form-item label="职务">
+          <el-input v-model="form.position" placeholder="职务" maxlength="50" />
+        </el-form-item>
+        <el-form-item label="角色">
+          <span style="color:#303133">会议执行 <span style="color:#909399;font-size:12px">(执行方人员固定, 暂唯一子类型)</span></span>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <div class="form-actions">
+      <el-button type="primary" :loading="saving" @click="onSave">保存</el-button>
+      <el-button @click="confirmCancel">取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { reactive, ref, computed, onMounted } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { bizAdd, bizUpdate, bizGet } from '@/api/public'
+
+const router = useRouter()
+const route = useRoute()
+
+const formRef = ref(null)
+const saving = ref(false)
+const loadingDetail = ref(false)
+const isEdit = !!route.params.id
+const personId = route.params.id || null
+
+const orgName = computed(() => route.query.orgName || '')
+const orgId = computed(() => route.query.orgId ? Number(route.query.orgId) : null)
+
+const form = reactive({
+  personId: null,
+  userName: '',
+  name: '',
+  phone: '',
+  orgName: '',
+  department: '',
+  position: ''
+})
+
+const rules = {
+  userName: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
+  name:     [{ required: true, message: '请输入姓名',   trigger: 'blur' }],
+  phone: [
+    { required: true, message: '请输入手机号', trigger: 'blur' },
+    { pattern: /^1\d{10}$/, message: '手机号格式错误', trigger: 'blur' }
+  ],
+  orgName:  [{ required: true, message: '请输入所属公司', trigger: 'blur' }]
+}
+
+function goBack() {
+  router.push('/manager/executor-people')
+}
+
+async function loadDetail() {
+  if (!personId) return
+  loadingDetail.value = true
+  try {
+    const res = await bizGet('person', personId)
+    if (res?.code === 200 && res.data) {
+      const d = res.data
+      Object.assign(form, {
+        personId: d.personId,
+        userName: d.userName || '',
+        name: d.name || '',
+        phone: d.phone || '',
+        orgName: d.orgName || '',
+        department: d.department || '',
+        position: d.position || ''
+      })
+    } else {
+      ElMessage.error(res?.msg || '加载失败')
+      goBack()
+    }
+  } catch (e) {
+    ElMessage.error(e?.msg || e?.message || '加载失败')
+    goBack()
+  } finally {
+    loadingDetail.value = false
+  }
+}
+
+function confirmCancel() {
+  const hasContent = form.name || form.phone || form.userName || form.orgName
+  if (!isEdit && !hasContent) { goBack(); return }
+  ElMessageBox.confirm('确定取消?未保存的内容将丢失', '提示', { type: 'warning' })
+    .then(() => goBack())
+    .catch(() => {})
+}
+
+async function onSave() {
+  try { await formRef.value.validate() } catch { return }
+  saving.value = true
+  try {
+    const payload = { ...form, unitType: 'executor', role: 'meetingExecutor' }
+    if (!isEdit && orgId.value) payload.orgId = orgId.value
+    if (isEdit) {
+      delete payload.personId
+      await bizUpdate('person', payload)
+      ElMessage.success('修改成功')
+    } else {
+      payload.status = '0'
+      payload.password = '123456'   // @JsonProperty("password") → loginPassword
+      await bizAdd('person', payload)
+      ElMessage.success('新建成功,默认密码 123456')
+    }
+    goBack()
+  } catch (e) {
+    ElMessage.error(e?.msg || e?.message || '保存失败')
+  } finally {
+    saving.value = false
+  }
+}
+
+onMounted(() => {
+  // 预填 orgName (从 org 页面跳来时)
+  if (!isEdit && orgName.value && !form.orgName) {
+    form.orgName = orgName.value
+  }
+  if (isEdit) loadDetail()
+})
+</script>
+
+<style scoped>
+.manager-executor-person-new { max-width: 1000px; }
+.page-card { background: #fff; padding: 16px 20px; border-radius: 6px; border: 1px solid #f0f0f0; }
+.breadcrumb { font-size: 13px; color: #8c8c8c; margin-bottom: 16px; }
+.breadcrumb a { color: var(--brand-primary); cursor: pointer; text-decoration: none; }
+.breadcrumb a:hover { color: var(--brand-primary-deep, var(--brand-primary)); }
+
+.form-card.nested { background: transparent; border: none; box-shadow: none; }
+:deep(.form-card .el-card__body) { padding: 24px 28px; }
+
+.form-actions { margin-top: 16px; display: flex; gap: 8px; }
+
+:deep(.el-button--primary) { background: var(--brand-primary); border-color: var(--brand-primary); border-radius: 4px; }
+:deep(.el-button--primary:hover) { background: var(--brand-primary-deep, var(--brand-primary)); border-color: var(--brand-primary-deep, var(--brand-primary)); }
+:deep(.el-button) { border-radius: 4px; }
+:deep(.el-input__wrapper) { border-radius: 4px; }
+</style>

ry-vue3/src/views/manager/ManagerProjectDetail.vue

@@ -281,7 +281,7 @@ async function openAddMonitor() {
   addMonitorOpen.value = true
   if (!monitorCandidates.value.length) {
     try {
-      const resp = await bizList('person', { pageNum: 1, pageSize: 100, role: '监察员', unitType: 'sponsor' })
+      const resp = await bizList('person', { pageNum: 1, pageSize: 100, role: 'supervisor', unitType: 'sponsor' })
       monitorCandidates.value = (resp && resp.rows) || ((resp && resp.data) && (resp && resp.data).rows) || (resp && resp.data) || []
     } catch (e) { monitorCandidates.value = [] }
   }
@@ -393,7 +393,7 @@ onMounted(async () => {
 
 .section-title {
   font-size: 14px; font-weight: 600; color: #262626; margin: 16px 0 12px;
-  padding-left: 8px; border-left: 3px solid var(--brand-primary, #1890ff);
+  padding-left: 8px; border-left: 3px solid var(--brand-primary);
 }
 
 /* 项目信息: 11 字段, 一列竖排 (el-form + 文本, 无分隔线) */
@@ -407,7 +407,7 @@ onMounted(async () => {
   font-family: ui-monospace, "Courier New", monospace;
 }
 .op-link {
-  color: var(--brand-primary, #1890ff); text-decoration: none;
+  color: var(--brand-primary); text-decoration: none;
   font-weight: 600; cursor: pointer; font-size: 15px;
 }
 .op-link:hover { text-decoration: underline; }
@@ -435,5 +435,5 @@ onMounted(async () => {
 .toolbar { display: flex; align-items: center; gap: 8px; margin-bottom: 12px; }
 
 /* 评分 */
-.score-num { font-size: 18px; color: var(--brand-primary, #1890ff); font-weight: 700; margin-right: 6px; }
+.score-num { font-size: 18px; color: var(--brand-primary); font-weight: 700; margin-right: 6px; }
 </style>

ry-vue3/src/views/manager/SponsorPersonNew.vue

@@ -0,0 +1,172 @@
+<template>
+  <!--
+    角色: 🟨 合规 支持单位下人员 新建/编辑 (manager/sponsor-people/new, manager/sponsor-people/edit/:id)
+    结构对齐 admin/ExpertNew.vue
+    unitType 硬编码 'sponsor'
+  -->
+  <div class="page-card manager-sponsor-person-new">
+    <div class="breadcrumb">
+      <a @click="goBack">支持单位下人员</a> &gt; {{ isEdit ? '编辑人员' : '新建人员' }}{{ orgName ? ' (' + orgName + ')' : '' }}
+    </div>
+
+    <el-card v-loading="loadingDetail" shadow="never" class="form-card nested">
+      <el-form :model="form" :rules="rules" ref="formRef" label-width="100px">
+        <el-form-item label="用户名" prop="userName">
+          <el-input v-model="form.userName" placeholder="登录用户名" maxlength="50" :disabled="isEdit" />
+        </el-form-item>
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="form.name" placeholder="姓名" maxlength="20" />
+        </el-form-item>
+        <el-form-item label="手机号" prop="phone">
+          <el-input v-model="form.phone" placeholder="手机号" maxlength="11" />
+        </el-form-item>
+        <el-form-item label="所属公司" prop="orgName">
+          <el-input v-model="form.orgName" placeholder="所属公司" maxlength="200" :disabled="!!orgId" />
+        </el-form-item>
+        <el-form-item label="部门">
+          <el-input v-model="form.department" placeholder="部门" maxlength="50" />
+        </el-form-item>
+        <el-form-item label="职务">
+          <el-input v-model="form.position" placeholder="职务" maxlength="50" />
+        </el-form-item>
+        <el-form-item label="角色">
+          <span style="color:#303133">监察员 <span style="color:#909399;font-size:12px">(赞助方人员固定)</span></span>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <div class="form-actions">
+      <el-button type="primary" :loading="saving" @click="onSave">保存</el-button>
+      <el-button @click="confirmCancel">取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { reactive, ref, computed, onMounted } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { bizAdd, bizUpdate, bizGet } from '@/api/public'
+
+const router = useRouter()
+const route = useRoute()
+
+const formRef = ref(null)
+const saving = ref(false)
+const loadingDetail = ref(false)
+const isEdit = !!route.params.id
+const personId = route.params.id || null
+
+const orgName = computed(() => route.query.orgName || '')
+const orgId = computed(() => route.query.orgId ? Number(route.query.orgId) : null)
+
+const form = reactive({
+  personId: null,
+  userName: '',
+  name: '',
+  phone: '',
+  orgName: '',
+  department: '',
+  position: ''
+})
+
+const rules = {
+  userName: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
+  name:     [{ required: true, message: '请输入姓名',   trigger: 'blur' }],
+  phone: [
+    { required: true, message: '请输入手机号', trigger: 'blur' },
+    { pattern: /^1\d{10}$/, message: '手机号格式错误', trigger: 'blur' }
+  ],
+  orgName:  [{ required: true, message: '请输入所属公司', trigger: 'blur' }]
+}
+
+function goBack() {
+  router.push('/manager/sponsor-people')
+}
+
+async function loadDetail() {
+  if (!personId) return
+  loadingDetail.value = true
+  try {
+    const res = await bizGet('person', personId)
+    if (res?.code === 200 && res.data) {
+      const d = res.data
+      Object.assign(form, {
+        personId: d.personId,
+        userName: d.userName || '',
+        name: d.name || '',
+        phone: d.phone || '',
+        orgName: d.orgName || '',
+        department: d.department || '',
+        position: d.position || ''
+      })
+    } else {
+      ElMessage.error(res?.msg || '加载失败')
+      goBack()
+    }
+  } catch (e) {
+    ElMessage.error(e?.msg || e?.message || '加载失败')
+    goBack()
+  } finally {
+    loadingDetail.value = false
+  }
+}
+
+function confirmCancel() {
+  const hasContent = form.name || form.phone || form.userName || form.orgName
+  if (!isEdit && !hasContent) { goBack(); return }
+  ElMessageBox.confirm('确定取消?未保存的内容将丢失', '提示', { type: 'warning' })
+    .then(() => goBack())
+    .catch(() => {})
+}
+
+async function onSave() {
+  try { await formRef.value.validate() } catch { return }
+  saving.value = true
+  try {
+    const payload = { ...form, unitType: 'sponsor', role: 'supervisor' }
+    if (!isEdit && orgId.value) payload.orgId = orgId.value
+    if (isEdit) {
+      delete payload.personId
+      await bizUpdate('person', payload)
+      ElMessage.success('修改成功')
+    } else {
+      payload.status = '0'
+      payload.password = '123456'   // @JsonProperty("password") → loginPassword
+      await bizAdd('person', payload)
+      ElMessage.success('新建成功,默认密码 123456')
+    }
+    goBack()
+  } catch (e) {
+    ElMessage.error(e?.msg || e?.message || '保存失败')
+  } finally {
+    saving.value = false
+  }
+}
+
+onMounted(() => {
+  // 预填 orgName (从 org 页面跳来时)
+  if (!isEdit && orgName.value && !form.orgName) {
+    form.orgName = orgName.value
+  }
+  if (isEdit) loadDetail()
+})
+</script>
+
+<style scoped>
+.manager-sponsor-person-new { max-width: 1000px; }
+.page-card { background: #fff; padding: 16px 20px; border-radius: 6px; border: 1px solid #f0f0f0; }
+.breadcrumb { font-size: 13px; color: #8c8c8c; margin-bottom: 16px; }
+.breadcrumb a { color: var(--brand-primary); cursor: pointer; text-decoration: none; }
+.breadcrumb a:hover { color: var(--brand-primary-deep, var(--brand-primary)); }
+
+.form-card.nested { background: transparent; border: none; box-shadow: none; }
+:deep(.form-card .el-card__body) { padding: 24px 28px; }
+
+.form-actions { margin-top: 16px; display: flex; gap: 8px; }
+
+:deep(.el-button--primary) { background: var(--brand-primary); border-color: var(--brand-primary); border-radius: 4px; }
+:deep(.el-button--primary:hover) { background: var(--brand-primary-deep, var(--brand-primary)); border-color: var(--brand-primary-deep, var(--brand-primary)); }
+:deep(.el-button) { border-radius: 4px; }
+:deep(.el-input__wrapper) { border-radius: 4px; }
+</style>

ry-vue3/src/views/sponsor/NewPerson.vue

@@ -42,7 +42,7 @@
         <el-row :gutter="12">
           <el-col :span="12">
             <el-form-item label="所属公司" prop="orgName">
-              <el-input v-model="form.orgName" placeholder="请输入所属公司 (TODO: 改 biz_org 下拉)" maxlength="200" />
+              <el-input v-model="form.orgName" placeholder="请输入所属公司" maxlength="200" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -61,7 +61,7 @@
           <el-col :span="12">
             <el-form-item label="角色" prop="role">
               <el-select v-model="form.role" placeholder="请选择" style="width:100%">
-                <el-option label="监察员" value="监察员" />
+                <el-option label="监察员" value="supervisor" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -111,7 +111,7 @@ const form = reactive({
   orgName: '',
   department: '',
   position: '',
-  role: '监察员',
+  role: 'supervisor',
   unitType: 'sponsor',
   status: '0',
   // 子账号登录信息 (后端会创建 sys_user SUB,parent_user_id=主账号)

ry-vue3/src/views/sponsor/Projects.vue

@@ -246,8 +246,8 @@ async function load() {
 async function loadPersons() {
   try {
     // sponsor 团队下"监察员"角色 + 已绑 sys_user 的子账号
-    const r = await bizList('person', { pageNum: 1, pageSize: 100, unitType: 'sponsor', role: '监察员' })
-    personList.value = (r.rows || []).filter(p => p.userId)
+    const r = await bizList('person', { pageNum: 1, pageSize: 100, unitType: 'sponsor', role: 'supervisor' })
+    personList.value = ((r.data && r.data.rows) || r.rows || []).filter(p => p.userId)
   } catch (e) { personList.value = [] }
 }
 

ry-vue3/src/views/sponsor/SponsorProjects.vue

@@ -288,7 +288,7 @@ const candidateMonitors = ref([])
 async function loadMonitors() {
   // 业务隔离: 仅查 login 主账号创建的人员 (parent_user_id = mainUserId)
   const mainUid = userStore.id
-  const res = await listBizPerson({ parentUserId: mainUid, role: '监察员', pageNum: 1, pageSize: 100 })
+  const res = await listBizPerson({ parentUserId: mainUid, role: 'supervisor', pageNum: 1, pageSize: 100 })
   allMonitors.value = res.rows || []
   candidateMonitors.value = allMonitors.value.slice()
 }

sql/migration_unify_role_type_2026_08_16.sql

@@ -0,0 +1,45 @@
+-- ============================================================================
+-- 2026-08-16 重构: 删除 biz_user_role_bind 表, 业务角色统一存 sys_user.role_type
+--
+-- 背景:
+--   原架构在两个地方存储业务角色 (admin/leader/manager/doctor/executor/sponsor):
+--     1. sys_user.role_type 列 (RuoYi 标准列, 只被 updateRoleType 写, 从未读)
+--     2. biz_user_role_bind 表 (自建, sys_user 的 1:N 关系设计, 但 replaceUserRoleType 实际是 delete+insert 强制单绑定)
+--   - 三个注册入口不一致: 专家/admin 创建走 sys_user.role_type, 执行单位走 biz_user_role_bind, 赞助方无实现
+--   - /admin/users 查询 LEFT JOIN biz_user_role_bind, 因此专家显示空 role_type
+--   - biz_user_role_bind 的 unit_id/unit_type 列始终为 NULL, 是死代码
+--
+-- 重构目标: 统一到 sys_user.role_type, 删 biz_user_role_bind
+-- 改动:
+--   1. sys_user 表确保 role_type 列存在 (RuoYi 标准列, 已存在)
+--   2. 从 biz_user_role_bind 同步 role_type 到 sys_user.role_type (兜底已有数据)
+--   3. DROP TABLE biz_user_role_bind
+-- ============================================================================
+
+-- 1. 确保 sys_user.role_type 列存在 (RuoYi 标准列通常在 ruoyi-mysql.sql 已建, 这里兜底)
+--    生产环境如果已存在会报错, 用 IF NOT EXISTS 容错
+SET @col_exists = (SELECT COUNT(*) FROM information_schema.columns
+                   WHERE table_schema = DATABASE() AND table_name = 'sys_user' AND column_name = 'role_type');
+SET @sql = IF(@col_exists = 0,
+              'ALTER TABLE sys_user ADD COLUMN role_type VARCHAR(20) DEFAULT NULL COMMENT ''业务角色 admin/leader/manager/doctor/executor/sponsor''',
+              'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+-- 2. 同步 biz_user_role_bind 的 role_type 到 sys_user.role_type
+--    一个 user 在 biz_user_role_bind 里最多 1 条 (replaceUserRoleType 强制), 用 MAX(role_type) 兜底
+UPDATE sys_user u
+LEFT JOIN (
+    SELECT user_id, MAX(role_type) AS role_type
+    FROM biz_user_role_bind
+    GROUP BY user_id
+) b ON b.user_id = u.user_id
+SET u.role_type = b.role_type
+WHERE u.role_type IS NULL AND b.role_type IS NOT NULL;
+
+-- 3. DROP biz_user_role_bind
+DROP TABLE IF EXISTS biz_user_role_bind;
+
+-- 4. 验证
+SELECT user_id, user_name, role_type FROM sys_user WHERE role_type IS NOT NULL ORDER BY user_id LIMIT 20;