Merge branch 'system-zyj' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysRoleServiceImpl.java

@@ -289,7 +289,7 @@ public class SysRoleServiceImpl extends AbstractCrudService<SysRoleMapper, SysRo
                 rm.setMenuId(menuId);
                 if(CollectionUtils.isNotEmpty(list1)){
                     for (int i = 0; i < list1.size(); i++) {
-                        if(menuId == list1.get(i).getMenuId()){
+                        if(menuId.equals(list1.get(i).getMenuId())){
                             rm.setMenuAliasName(list1.get(i).getMenuAliasName());
                         }
                     }

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysRoleMenuMapper.xml

@@ -25,9 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  	</delete>
 	
 	<insert id="batchRoleMenu">
-		insert into sys_role_menu(role_id, menu_id) values
+		insert into sys_role_menu(role_id, menu_id, menu_alias_name) values
 		<foreach item="item" index="index" collection="list" separator=",">
-			(#{item.roleId},#{item.menuId})
+			(#{item.roleId},#{item.menuId},#{item.menuAliasName})
 		</foreach>
 	</insert>