Merge remote-tracking branch 'public/jmn_dev' into leng_dev

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleMenuService.java

@@ -34,11 +34,10 @@ public interface SysRoleMenuService extends IService<SysRoleMenu> {
 
 	/**
 	 * 更新角色菜单
-	 * @param role
-	 * @param roleId 角色
+	 * @param roleId 角色ID
 	 * @param menuIds 菜单ID拼成的字符串，每个id之间根据逗号分隔
 	 * @return
 	 */
-	Boolean saveRoleMenus(String role, Long roleId, String menuIds);
+	Boolean saveRoleMenus( Long roleId, String menuIds);
 
 }

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java

@@ -59,7 +59,7 @@ public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRo
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	@CacheEvict(value = CacheConstants.MENU_DETAILS, key = "#roleId")
-	public Boolean saveRoleMenus(String role, Long roleId, String menuIds) {
+	public Boolean saveRoleMenus( Long roleId, String menuIds) {
 		this.remove(Wrappers.<SysRoleMenu>query().lambda().eq(SysRoleMenu::getRoleId, roleId));
 
 		if (StrUtil.isBlank(menuIds)) {

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java

@@ -90,8 +90,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 	 */
 	@Override
 	public Boolean updateRoleMenus(RoleVO roleVo) {
-		SysRole sysRole = baseMapper.selectById(roleVo.getRoleId());
-		return roleMenuService.saveRoleMenus(sysRole.getRoleCode(), roleVo.getRoleId(), roleVo.getMenuIds());
+		return roleMenuService.saveRoleMenus( roleVo.getRoleId(), roleVo.getMenuIds());
 	}
 
 }