Merge branch 'dev' of http://gitlab.91isoft.com:90/wangfei/vehicle-quality-review into wangdingyi

quality-review/src/main/resources/mapper/AutomobileEnterpriseMapper.xml

@@ -64,7 +64,6 @@
             </if>
             <if test="contactNumber != null  and contactNumber != ''">and ae.contact_number like concat('%', #{contactNumber}, '%')</if>
         </where>
-        order by ae.create_time desc
     </select>
 
     <select id="selectAutomobileEnterpriseById" parameterType="Long" resultMap="AutomobileEnterpriseResult">

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java

@@ -63,6 +63,19 @@ public class SysMenu extends BaseEntity
     /** 菜单图标 */
     private String icon;
 
+    /**
+     * 二级菜单名称
+     */
+    private String secondaryMenuName;
+
+    public String getSecondaryMenuName() {
+        return secondaryMenuName;
+    }
+
+    public void setSecondaryMenuName(String secondaryMenuName) {
+        this.secondaryMenuName = secondaryMenuName;
+    }
+
     /** 子菜单 */
     private List<SysMenu> children = new ArrayList<SysMenu>();
 
@@ -254,6 +267,7 @@ public class SysMenu extends BaseEntity
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
+            .append("secondaryMenuName", getSecondaryMenuName())
             .toString();
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java

@@ -21,6 +21,11 @@ public class RouterVo
      */
     private String path;
 
+    /**
+     * 二级菜单名称
+     */
+    private String secondaryMenuName;
+
     /**
      * 是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现
      */
@@ -56,6 +61,14 @@ public class RouterVo
      */
     private List<RouterVo> children;
 
+    public String getSecondaryMenuName() {
+        return secondaryMenuName;
+    }
+
+    public void setSecondaryMenuName(String secondaryMenuName) {
+        this.secondaryMenuName = secondaryMenuName;
+    }
+
     public String getName()
     {
         return name;

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -169,6 +169,7 @@ public class SysMenuServiceImpl implements ISysMenuService
         {
             RouterVo router = new RouterVo();
             router.setHidden("1".equals(menu.getVisible()));
+            router.setSecondaryMenuName(menu.getSecondaryMenuName());
             router.setName(getRouteName(menu));
             router.setPath(getRouterPath(menu));
             router.setComponent(getComponent(menu));

ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -25,10 +25,11 @@
 		<result property="updateTime"     column="update_time"    />
 		<result property="updateBy"       column="update_by"      />
 		<result property="remark"         column="remark"         />
+		<result property="secondaryMenuName"         column="secondary_menu_name"         />
 	</resultMap>
 
 	<sql id="selectMenuVo">
-        select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time 
+        select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time, secondary_menu_name
 		from sys_menu
     </sql>
 
@@ -49,7 +50,7 @@
 	</select>
 
 	<select id="selectMenuTreeAll" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time, m.secondary_menu_name
 		from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
 		order by m.parent_id, m.order_num
 	</select>