Browse Source

迁移代码

jichaobo 2 years ago
parent
commit
e5c25a12bc

+ 5 - 3
service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysPlatformMapper.java

@@ -26,10 +26,12 @@ public interface SysPlatformMapper extends CrudMapper<SysPlatform> {
                                         @Param("size") Integer size,
                                         @Param("id") Integer id);
 
-    List<SysMenu> getMenuIdListOne(Long[] menuIds, String menuType);
+    List<SysMenu> getMenuIdListOne(@Param("menuIds") Long[] menuIds,
+                                   @Param("menuType") String menuType);
 
-    int deletePlatformMenuBy(Long platformId);
+    int deletePlatformMenuBy(@Param("platformId") Long platformId);
 
 
-    List<SysPlatformMenu> getMenuListOne(Long platformId, String menuType);
+    List<SysPlatformMenu> getMenuListOne(@Param("platformId") Long platformId,
+                                         @Param("menuType")  String menuType);
 }

+ 3 - 2
service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysPlatformMenuMapper.java

@@ -21,9 +21,10 @@ public interface SysPlatformMenuMapper extends CrudMapper<SysPlatformMenu> {
     List<SysMenu> getMenuList(@Param("platformId") Integer platformId,
                               @Param("menuType") String menuType);
 
-    List<SysMenu> getMenuIdList(Long[] menuIds, String menuType);
+    List<SysMenu> getMenuIdList(@Param("menuIds") Long[] menuIds,
+                                @Param("menuType") String menuType);
 
-    int deleteTenantMenuBy(Long tenantId);
+    int deleteTenantMenuBy(@Param("tenantId") Long tenantId);
 
     List<SysTenantMenu> getMenuListOne(@Param("tenantId") Integer tenantId,
                                        @Param("menuType") String menuType);

+ 4 - 1
service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserMapper.java

@@ -133,5 +133,8 @@ public interface SysUserMapper extends CrudMapper<SysUser>
 
     public int resetUserPwdOne(@Param("userId") Long userId, @Param("password") String password);
 
-    public List<SysUser> getUserData(Integer tenantId,Integer current,Integer size,long userId);
+    public List<SysUser> getUserData(@Param("tenantId") Integer tenantId,
+                                     @Param("current") Integer current,
+                                     @Param("size") Integer size,
+                                     @Param("userId") long userId);
 }

+ 1 - 1
service-system/service-system-biz/src/main/resources/mapper/system/SysPlatformMenuMapper.xml

@@ -35,7 +35,7 @@
         <foreach collection="menuIds" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
-        group by parent_id
+        group by a.menu_id
     </select>
 
     <delete id="deleteTenantMenuBy" parameterType="Long">