gen radio fix

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuappController.java

@@ -95,6 +95,15 @@ public class SysMenuappController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:menuapp:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
+        SysMenuapp detail = sysMenuappService.selectSysMenuappById(id);
+        return success(detail);
+    }
+
+    /**
+     * 获取手机菜单详细信息
+     */
+    @GetMapping(value = "/detail/{id}")
+    public AjaxResult detail(@PathVariable("id") Long id) {
         SysMenuapp detail = sysMenuappService.selectSysMenuappById(id);
         TranslateUtils.translate(detail, false);
         return success(detail);
@@ -105,7 +114,7 @@ public class SysMenuappController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:menuapp:add')")
     @Log(title = "手机菜单", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     public AjaxResult add(@RequestBody SysMenuapp sysMenuapp) {
         return toAjax(sysMenuappService.insertSysMenuapp(sysMenuapp));
     }
@@ -115,7 +124,7 @@ public class SysMenuappController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:menuapp:edit')")
     @Log(title = "手机菜单", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/update")
     public AjaxResult edit(@RequestBody SysMenuapp sysMenuapp) {
         return toAjax(sysMenuappService.updateSysMenuapp(sysMenuapp));
     }
@@ -125,7 +134,7 @@ public class SysMenuappController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:menuapp:remove')")
     @Log(title = "手机菜单", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
+    @GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(sysMenuappService.deleteSysMenuappByIds(ids));
     }
@@ -147,7 +156,7 @@ public class SysMenuappController extends BaseController {
 
     private AjaxResult respMenus(List<SysMenuapp> list) {
         int size = list.size();
-        List<SysDictData> modle_name = DictUtils.getDictCache("modle_type");
+        List<SysDictData> modle_name = DictUtils.getDictCache("model_type");
         Map<String, Long> modleNameOrderMap = modle_name.stream().collect(Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictSort));
         Map<String, List<SysMenuapp>> groups = list.stream()
                 .sorted(Comparator.comparing((x) -> modleNameOrderMap.get(((SysMenuapp) x).getModelType()))

ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

@@ -274,7 +274,7 @@
 #elseif($column.htmlType == "radio" && "" != $dictType)
         <el-form-item label="${comment}" prop="${field}">
           <el-radio-group v-model="form.${field}">
-            <el-radio v-for="dict in dict.type.${dictType}" :key="dict.value" :label="dict.label" #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)" #else:value="dict.value"#end></el-radio>
+            <el-radio v-for="dict in dict.type.${dictType}" :key="dict.value" #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)" #else:label="dict.value"#end>{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
 #elseif($column.htmlType == "radio" && $dictType)

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

@@ -167,18 +167,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectSysMobileListByUserId" resultMap="SysMenuappResult">
-        SELECT t.id, t.identity_type, t.modle_name, t.menu_name, t.order_num, t.menu_icon, t.menu_url, t.url_para, t.sys_normal_disable, t.remark, t.create_by, t.create_time, t.update_by, t.update_time FROM sys_mobile t
-        JOIN sys_role_mobile rm ON rm.mobile_id = t.id
+        SELECT t.id, t.model_type, t.menu_name, t.menu_num, t.menu_icon, t.menu_url, t.menu_status, t.remark FROM sys_menuapp t
+        JOIN sys_role_menuapp rm ON rm.app_id = t.id
         JOIN sys_user_role ur ON ur.role_id = rm.role_id
         JOIN sys_user u ON u.user_id = ur.user_id
         JOIN sys_role r ON r.role_id = ur.role_id
         <where>
             u.user_id = #{userId}
-            AND t.sys_normal_disable = '0'
+            AND t.menu_status = '0'
             AND r.status = '0'
             <if test="query != null">
-                <if test="query.identityType != null  and query.identityType != ''"> and t.identity_type = #{query.identityType}</if>
-                <if test="query.modleName != null  and query.modleName != ''"> and t.modle_name = #{query.modleName}</if>
+                <if test="query.modeltype != null  and query.modeltype != ''"> and t.model_type = #{query.modeltype}</if>
                 <if test="query.menuName != null  and query.menuName != ''"> and t.menu_name like concat('%', #{query.menuName}, '%')</if>
             </if>
         </where>