菜单

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/mapper/RoleMapper.java

@@ -14,7 +14,8 @@ import java.util.List;
 @MyBatisMapper
 public interface RoleMapper extends BaseMapper<Role> {
 
-    @Select("select r.id, r.code, r.name from role r left join user_role ur " +
+    @Select("select r.id, r.code, r.name, r.company_id as companyId " +
+            "from role r left join user_role ur " +
             "on r.id = ur.role_id " +
             "where ur.user_id = #{userId} " +
             "and r.code = #{roleCode}")

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/RoleMenuService.java

@@ -43,7 +43,7 @@ public class RoleMenuService extends ServiceImpl<RoleMenuMapper, RoleMenu> imple
         if (needSaveRoleMenuList.size() > 0) {
             return this.saveBatch(needSaveRoleMenuList);
         }
-        return false;
+        return true;
     }
 
     @Override

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/RoleService.java

@@ -83,7 +83,7 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> implements IRoleS
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "保存角色信息失败");
         }
         //保存角色菜单关联关系
-        if (roleMenuService.saveRoleMenu(role.getId(), roleRequest.getMenuIds())) {
+        if (!roleMenuService.saveRoleMenu(role.getId(), roleRequest.getMenuIds())) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "保存角色信息失败");
         }