增加处理空列表情况
This commit is contained in:
parent
5f52e7f020
commit
35e62a2c71
|
|
@ -9,11 +9,10 @@ import com.electromagnetic.industry.software.manage.pojo.models.RolePermission;
|
||||||
import com.electromagnetic.industry.software.manage.pojo.models.UserRole;
|
import com.electromagnetic.industry.software.manage.pojo.models.UserRole;
|
||||||
import com.electromagnetic.industry.software.manage.service.PermissionService;
|
import com.electromagnetic.industry.software.manage.service.PermissionService;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import java.util.HashMap;
|
import java.util.*;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
|
|
@ -32,16 +31,19 @@ public class PermissionServiceImpl implements PermissionService {
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional
|
||||||
public Map<String, Boolean> getUserPermission(String userId, String id) {
|
public Map<String, Boolean> getUserPermission(String userId, String id) {
|
||||||
|
|
||||||
List<String> roleIds = getRoles(userId);
|
List<String> roleIds = getRoles(userId);
|
||||||
|
// 只有当 roleIds 不为空且不为 null 时,才添加 in 条件
|
||||||
|
if (roleIds == null || roleIds.isEmpty()) {
|
||||||
|
return transToMap(new ArrayList<>());
|
||||||
|
}
|
||||||
LambdaQueryWrapper<RolePermission> queryWrapper1 = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<RolePermission> queryWrapper1 = new LambdaQueryWrapper<>();
|
||||||
queryWrapper1.select(RolePermission::getPermissionCode)
|
queryWrapper1.select(RolePermission::getPermissionCode)
|
||||||
.eq(RolePermission::getFileId, id)
|
.eq(RolePermission::getFileId, id)
|
||||||
.in(RolePermission::getRoleId, roleIds);
|
.in(RolePermission::getRoleId, roleIds);
|
||||||
List<String> permissionCodes = rolePermissionMapper.selectObjs(queryWrapper1).stream().map(Object::toString).collect(Collectors.toList());
|
List<String> permissionCodes = rolePermissionMapper.selectObjs(queryWrapper1).stream().map(Object::toString).collect(Collectors.toList());
|
||||||
|
|
||||||
return transToMap(permissionCodes);
|
return transToMap(permissionCodes);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue