diff --git a/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizProject.java b/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizProject.java index aee3771..91163c4 100644 --- a/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizProject.java +++ b/ry-api/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizProject.java @@ -2,6 +2,7 @@ package com.ruoyi.business.domain; import java.math.BigDecimal; import java.util.Date; +import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; @@ -51,8 +52,10 @@ public class BizProject extends BaseEntity { /** 支持方负责人用户名(冗余) — 原 org_name */ @Excel(name = "sponsor_admin_user_name") private String sponsorAdminUserName; - /** 支持单位名称 (查询参数 + 列表展示列, JOIN biz_org 取 org_name, org_type='sponsor') */ + /** 支持单位名称 (列表展示列, JOIN biz_org 取 org_name, org_type='sponsor') */ private String sponsorOrgName; + /** 支持单位筛选 (sys_user.user_id 列表, IN 查询, 多选 select 透传) */ + private List sponsorAdminUserIds; /** 服务机构名称 (查询条件, 仅匹配 org_type='executor' + org_name LIKE) */ private String execOrgName; /** 服务机构名称列表, 多个用英文逗号连接 (GROUP_CONCAT 派生, 不入库, 仅展示) */ @@ -163,6 +166,8 @@ public class BizProject extends BaseEntity { public void setSponsorAdminUserName(String sponsorAdminUserName) { this.sponsorAdminUserName = sponsorAdminUserName; } public String getSponsorOrgName() { return sponsorOrgName; } public void setSponsorOrgName(String sponsorOrgName) { this.sponsorOrgName = sponsorOrgName; } + public List getSponsorAdminUserIds() { return sponsorAdminUserIds; } + public void setSponsorAdminUserIds(List sponsorAdminUserIds) { this.sponsorAdminUserIds = sponsorAdminUserIds; } public String getExecOrgName() { return execOrgName; } public void setExecOrgName(String execOrgName) { this.execOrgName = execOrgName; } public String getExecOrgNames() { return execOrgNames; } diff --git a/ry-api/ruoyi-business/src/main/resources/mapper/business/BizOrgMapper.xml b/ry-api/ruoyi-business/src/main/resources/mapper/business/BizOrgMapper.xml index 2ce9be1..3b2345a 100644 --- a/ry-api/ruoyi-business/src/main/resources/mapper/business/BizOrgMapper.xml +++ b/ry-api/ruoyi-business/src/main/resources/mapper/business/BizOrgMapper.xml @@ -118,6 +118,7 @@ and o.user_id = #{userId} and o.org_name like concat('%', #{orgName}, '%') order by o.org_id desc + LIMIT 5