From 098cd78d4db59f7557dc0b769e5f0a145f57bc01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 9 Nov 2023 19:09:22 +0800
Subject: [PATCH] 2.0

---
 .../java/com/xm/core/mapper/XmMenuMapper.xml   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmMenuMapper.xml b/xm-core/src/main/java/com/xm/core/mapper/XmMenuMapper.xml
index 8cfd94cb..b5a56ffd 100644
--- a/xm-core/src/main/java/com/xm/core/mapper/XmMenuMapper.xml
+++ b/xm-core/src/main/java/com/xm/core/mapper/XmMenuMapper.xml
@@ -196,7 +196,7 @@
         </foreach>
     </select>
     <select id="getXmMenuAttDist" parameterType="HashMap" resultType="HashMap">
-        select count(*) as value,${groupBy} as name from xm_menu res
+        select count(*) as value,${ext.groupBy} as name from xm_menu res
         <where>
             ${@com.mdp.Util@trimWhere(ew.customSqlSegment)}
             <!--下面可以添加更多查询条件，正常的if 条件都是支持的-->
@@ -206,7 +206,7 @@
         ${@com.mdp.Util@trimOrderBy(ew.customSqlSegment,'')}
         <!--下面双引号内可以添加默认分组，如果前端没有上传分组，将使用引号内的分组规则-->
         ${@com.mdp.Util@trimGroupBy(ew.customSqlSegment,'')}
-        group by ${groupBy}
+        group by ${ext.groupBy}
     </select>
     <select id="getXmMenuAgeDist" parameterType="HashMap" resultType="HashMap">
 
@@ -222,18 +222,18 @@
     </select>
 
     <select id="getXmMenuSort" parameterType="HashMap" resultType="HashMap">
-        select count(*) as value,${groupBy} as id,
+        select count(*) as value,${ext.groupBy} as id,
         max(
-        <if test="groupBy=='func_id'">func_name</if>
-        <if test="groupBy=='proposer_id'">proposer_name</if>
-        <if test="groupBy=='mm_userid'">mm_username</if>
-        <if test="groupBy=='product_id'">product_id</if>
-        <if test="groupBy=='iteration_id'">iteration_name</if>
+        <if test="ext.groupBy=='func_id'">func_name</if>
+        <if test="ext.groupBy=='proposer_id'">proposer_name</if>
+        <if test="ext.groupBy=='mm_userid'">mm_username</if>
+        <if test="ext.groupBy=='product_id'">product_id</if>
+        <if test="ext.groupBy=='iteration_id'">iteration_name</if>
         ) as name from xm_menu res
         <where>
             <include refid="whereForMap"></include>
         </where>
-        group by ${groupBy}
+        group by ${ext.groupBy}
     </select>
 
     <select id="getUserCanOpMenusByIds" parameterType="HashMap" resultType="com.xm.core.entity.XmMenu">