tieshengkeji/tiesheng-springboot
1
1
Fork 0
Code Pull Requests Actions Packages Releases Activity

fix：角色列表和角色授权bug

Browse Source
This commit is contained in:
曾文豪
2024-07-03 13:31:23 +08:00
parent c9679eeeac
commit fd92109e2e
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
springboot-role/src/main/java/com/tiesheng/role/controller/RoleController.java
View File

@@ -43,6 +43,7 @@ public class RoleController {
public ApiResp<List<CoreRoleGroup>> groupList(@Valid GroupTypeDTO dto) { public ApiResp<List<CoreRoleGroup>> groupList(@Valid GroupTypeDTO dto) {
return ApiResp.respOK(coreRoleService.list( return ApiResp.respOK(coreRoleService.list(
new QueryWrapper<CoreRoleGroup>() new QueryWrapper<CoreRoleGroup>()
.eq("is_deleted", 0)
.eq("type", dto.getType()) .eq("type", dto.getType())
.orderByAsc("sort") .orderByAsc("sort")
)); ));

9
springboot-role/src/main/java/com/tiesheng/role/service/CoreRoleService.java
View File

@@ -9,7 +9,6 @@ import com.tiesheng.role.pojos.dao.CoreRoleAuthority;
import com.tiesheng.role.pojos.dao.CoreRoleGroup; import com.tiesheng.role.pojos.dao.CoreRoleGroup;
import com.tiesheng.role.pojos.dao.CoreRoleGroupRx; import com.tiesheng.role.pojos.dao.CoreRoleGroupRx;
import com.tiesheng.role.pojos.dto.GroupRxUpdateDTO; import com.tiesheng.role.pojos.dto.GroupRxUpdateDTO;
import com.tiesheng.role.pojos.dto.MenuListDTO;
import com.tiesheng.role.pojos.dto.OwnerMenuDTO; import com.tiesheng.role.pojos.dto.OwnerMenuDTO;
import com.tiesheng.role.pojos.vo.ServiceMenuVO; import com.tiesheng.role.pojos.vo.ServiceMenuVO;
import com.tiesheng.util.service.TsServiceBase; import com.tiesheng.util.service.TsServiceBase;
@@ -17,7 +16,10 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.*; import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Service @Service
@@ -96,8 +98,11 @@ public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRole
coreRoleGroupRx.setMenuId(menuId); coreRoleGroupRx.setMenuId(menuId);
list.add(coreRoleGroupRx); list.add(coreRoleGroupRx);
} }
if (CollUtil.isNotEmpty(list)) {
coreRoleGroupRxMapper.batchInsert(list); coreRoleGroupRxMapper.batchInsert(list);
} }
}
/** /**