From 1b351617221dace88c685e7fa45a81d38bf01947 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: Thu, 20 Aug 2026 22:19:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=94=B9=20IN=20=E6=9F=A5=E8=AF=A2=20(?= =?UTF-8?q?=E5=90=8E=E7=AB=AF)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BizProject.sponsorOrgName 字段历史上同时承担「查询参数 + 列表展示」两个职责, 现拆开: - 保留: sponsorOrgName (String), 列表展示, JOIN biz_org 派生 - 新增: sponsorAdminUserIds (List), 查询参数, IN 多个 user_id 对齐方案 1 设计 (与 DB 列 sponsor_admin_user_id 命名一致, 与 assignForm.sponsorAdminUserId 单数版对齐)。 改动: - BizProject.java: 加 import java.util.List; 加 List sponsorAdminUserIds + getter/setter; 改 sponsorOrgName 注释 (不再当查询参数, 只展示) - BizProjectMapper.xml L167-173: 替换 sponsorOrgName LIKE 块为 sponsorAdminUserIds IN 块 (foreach 展开) - BizOrgMapper.xml L120: selectSponsorOrgOptions 末尾加 LIMIT 5 (前端多选下拉最多 5 条) 未做: - 前端 manager/Projects.vue L6 el-input 还在 (下一 commit 切到 el-select multiple) - 旧的 sponsorOrgName LIKE 块已不存在, 但前端 q.sponsorOrgName 字段也还没改 (prototype 兼容期) --- .../java/com/ruoyi/business/domain/BizProject.java | 7 ++++++- .../main/resources/mapper/business/BizOrgMapper.xml | 1 + .../resources/mapper/business/BizProjectMapper.xml | 12 +++++------- 3 files changed, 12 insertions(+), 8 deletions(-) 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