From bbad3efa979065176d2038d40c8e2046b1e32ef2 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 21 Dec 2023 17:55:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sysreportparametermain/SysReportParameterMainMapper.java    | 2 +-
 .../biz/sysreportparametermain/SysReportParameterMainMapper.xml | 2 +-
 .../sysreportparametermain/SysReportParameterMainService.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainMapper.java
index 9f123bc7f9..3071df4ee1 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainMapper.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainMapper.java
@@ -27,5 +27,5 @@ public interface SysReportParameterMainMapper extends BaseMapper<SysReportParame
 
     List<SysReportParameterMainInitsVo> selectGroup(String sid);
 
-    List<SysReportParameterColumn> selectGroups(String tableNameKey);
+    List<SysReportParameterColumn> selectGroups(@Param("tableNameKey") String tableNameKey,@Param("sid") String sid);
 }
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainMapper.xml
index 506bc13ac6..c4a1157537 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainMapper.xml
@@ -42,6 +42,6 @@
     <select id="selectGroups" resultType="com.yxt.anrui.portal.api.sysreportparameter.SysReportParameterColumn">
         select colName, colText
         from sys_report_parameter
-        where tableNameKey = #{tableNameKey}
+        where tableNameKey = #{tableNameKey} and mainSid = #{sid}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainService.java
index cf855f3fac..73c280adc7 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainService.java
@@ -87,7 +87,7 @@ public class SysReportParameterMainService extends MybatisBaseService<SysReportP
         List<SysReportParameterMainInitsVo> list = baseMapper.selectGroup(sid);
         for (int i = 0; i < list.size(); i++) {
             SysReportParameterMainInitsVo sysReportParameterMainInitsVo = list.get(i);
-            List<SysReportParameterColumn> lists = baseMapper.selectGroups(sysReportParameterMainInitsVo.getTableNameKey());
+            List<SysReportParameterColumn> lists = baseMapper.selectGroups(sysReportParameterMainInitsVo.getTableNameKey(),sid);
             lists.removeAll(Collections.singleton(null));
             if(!lists.isEmpty()){
                 sysReportParameterMainInitsVo.setList(lists);