提交代码

yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/domain/SurMenuConfig.java

@@ -42,6 +42,10 @@ public class SurMenuConfig extends BaseEntity
     @Excel(name = "菜单排序")
     private Integer menuSort;
 
+    /** 菜单分类 */
+    @Excel(name = "菜单分类")
+    private String menuType;
+
     /** 菜单配置角色信息 */
     private List<SurMenuConfigRole> surMenuConfigRoleList;
 
@@ -118,6 +122,14 @@ public class SurMenuConfig extends BaseEntity
         this.menuSort = menuSort;
     }
 
+    public String getMenuType() {
+        return menuType;
+    }
+
+    public void setMenuType(String menuType) {
+        this.menuType = menuType;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/domain/SurMenuConfigRole.java

@@ -23,6 +23,10 @@ public class SurMenuConfigRole extends BaseEntity
     @Excel(name = "角色主键")
     private Long roleId;
 
+    /** 角色名称 */
+    @Excel(name = "角色名称")
+    private String roleName;
+
     public void setSmcid(Long smcid) 
     {
         this.smcid = smcid;
@@ -42,6 +46,14 @@ public class SurMenuConfigRole extends BaseEntity
         return roleId;
     }
 
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

yanzhu-jh/src/main/resources/mapper/wxsetting/SurMenuConfigMapper.xml

@@ -12,6 +12,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="menuUrl"    column="menu_url"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createTime"    column="create_time"    />
+        <result property="menuSort"    column="menu_sort"    />
+        <result property="menuType"    column="menu_type"    />
     </resultMap>
 
     <resultMap id="SurMenuConfigSurMenuConfigRoleResult" type="SurMenuConfig" extends="SurMenuConfigResult">
@@ -24,22 +26,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSurMenuConfigVo">
-        select id, menu_name, menu_identi, menu_img, menu_url, del_flag, create_time from sur_menu_config
+        select id, menu_name, menu_identi, menu_img, menu_url, del_flag, create_time, menu_type, menu_sort from sur_menu_config
     </sql>
 
     <select id="selectSurMenuConfigList" parameterType="SurMenuConfig" resultMap="SurMenuConfigResult">
         <include refid="selectSurMenuConfigVo"/>
-        <where>  
+        <where>
             <if test="menuName != null  and menuName != ''"> and menu_name like concat('%', #{menuName}, '%')</if>
             <if test="menuIdenti != null  and menuIdenti != ''"> and menu_identi = #{menuIdenti}</if>
             <if test="menuImg != null  and menuImg != ''"> and menu_img = #{menuImg}</if>
             <if test="menuUrl != null  and menuUrl != ''"> and menu_url = #{menuUrl}</if>
             <if test="delFlag != null "> and del_flag = #{delFlag}</if>
+            <if test="menuType != null "> and menu_type = #{menuType}</if>
         </where>
     </select>
     
     <select id="selectSurMenuConfigById" parameterType="Long" resultMap="SurMenuConfigSurMenuConfigRoleResult">
-        select a.id, a.menu_name, a.menu_identi, a.menu_img, a.menu_url, a.del_flag, a.create_time,
+        select a.id, a.menu_name, a.menu_identi, a.menu_img, a.menu_url, a.del_flag, a.create_time,menu_type,menu_sort,
  b.smcid as sub_smcid, b.role_id as sub_role_id
         from sur_menu_config a
         left join sur_menu_config_role b on b.smcid = a.id
@@ -55,6 +58,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="menuUrl != null">menu_url,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createTime != null">create_time,</if>
+            <if test="menuSort != null">menu_sort,</if>
+            <if test="menuType != null">menu_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="menuName != null">#{menuName},</if>
@@ -63,6 +68,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="menuUrl != null">#{menuUrl},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createTime != null">#{createTime},</if>
+            <if test="menuSort != null">#{menuSort},</if>
+            <if test="menuType != null">#{menuType},</if>
          </trim>
     </insert>
 
@@ -75,6 +82,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="menuUrl != null">menu_url = #{menuUrl},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="menuSort != null">menu_sort = #{menuSort},</if>
+            <if test="menuType != null">menu_type = #{menuType},</if>
         </trim>
         where id = #{id}
     </update>