|
@@ -11,7 +11,6 @@ import com.winhc.repal.entity.RepalRolePermission;
|
|
|
import com.winhc.repal.enums.DeletedStatusEnum;
|
|
|
import com.winhc.repal.enums.RoleTypeEnum;
|
|
|
import com.winhc.repal.model.dto.MemberRoleDTO;
|
|
|
-import com.winhc.repal.model.dto.UpdateRolePermissionDTO;
|
|
|
import com.winhc.repal.model.vo.GroupRoleVO;
|
|
|
import com.winhc.repal.model.vo.RolePermissionVO;
|
|
|
import com.winhc.repal.repository.RepalGroupRoleMapper;
|
|
@@ -70,7 +69,7 @@ public class RepalGroupRoleServiceImpl extends ServiceImpl<RepalGroupRoleMapper,
|
|
|
List<RepalGroupRole> groupRoleList = this.list(Wrappers.lambdaQuery(RepalGroupRole.class)
|
|
|
.in(RepalGroupRole::getRepalGroupId, Stream.of(0, repalGroupMemberService.getUserGroupId(userId)).collect(Collectors.toList()))
|
|
|
.eq(RepalGroupRole::getDeleted, DeletedStatusEnum.NORMAL.getCode())
|
|
|
- .orderByDesc(RepalGroupRole::getId));
|
|
|
+ .orderByAsc(RepalGroupRole::getId));
|
|
|
return groupRoleList.stream().map(role -> {
|
|
|
GroupRoleVO vo = new GroupRoleVO();
|
|
|
vo.setRoleId(role.getId());
|