[修改] isAct

adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml

@@ -228,7 +228,7 @@
         ORDER BY updateDate desc
     </select>
     <select id="isAct" resultType="java.lang.String">
-        SELECT rep.name FROM
+        SELECT pro.prc_name FROM
         bus_process_name pro
         WHERE pro.CREAT_USER = #{Vo.usid}
         and pro.SUBMIT_STATUS = 1
@@ -236,7 +236,7 @@
         <foreach collection="Vo.ids" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
-        GROUP BY rep.id;
+        GROUP BY pro.id;
     </select>
 
     <select id="selectByidAndName" resultType="java.lang.Long">

adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml

@@ -228,7 +228,7 @@
         ORDER BY updateDate desc
     </select>
     <select id="isAct" resultType="java.lang.String">
-        SELECT rep.name FROM
+        SELECT pro.prc_name FROM
         bus_process_name pro
         WHERE pro.CREAT_USER = #{Vo.usid}
         and pro.SUBMIT_STATUS = 1
@@ -236,7 +236,7 @@
         <foreach collection="Vo.ids" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
-        GROUP BY rep.id;
+        GROUP BY pro.id;
     </select>
 
     <select id="selectByidAndName" resultType="java.lang.Long">

adc-da-sys/target/classes/mybatis/mapper/sys/mysql/MenuEOMapper.xml

@@ -18,11 +18,12 @@
         <result column="remarks" property="remarks"/>
         <result column="sort" property="sort"/>
         <result column="ext_info" property="extInfo" />
+        <result column="is_button" property="isButton" />
     </resultMap>
 
     <!-- TS_MENU table all fields -->
     <sql id="Base_Column_List">
-        id, del_flag, name, parent_id, parent_ids, href, icon,iconHref,iconClick,iconClickHref, is_show, permission, remarks, sort, ext_info,is_url
+        id, del_flag, name, parent_id, parent_ids, href, icon,iconHref,iconClick,iconClickHref, is_show, permission, remarks, sort, ext_info,is_url,is_button
     </sql>
 
     <!-- 用于按名称查询记录时的sql，添加前缀TS_MENU -->