Browse Source

修改更新获取用户的角色错误的问题

gaohp 10 months ago
parent
commit
3a116e3c86

+ 1 - 1
feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/job/order/TradeOrderAutoCalcJob.java

@@ -59,7 +59,7 @@ public class TradeOrderAutoCalcJob implements JobHandler {
 
         CalcMessage calcMessage = CalcMessage.builder().orderCalcMessages(orderCalcMessages).distriOrderMessages(appTradeOrderDetailRespVos).build();
         distriOrderProducer.sendDistriOrderMessage(calcMessage);
-        return String.format("计算订单信息结束");
+        return "计算订单信息结束";
 
 
     }

+ 6 - 5
feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/dal/mysql/permission/RoleMapper.java

@@ -1,6 +1,7 @@
 package cn.newfeifan.mall.module.system.dal.mysql.permission;
 
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.framework.common.util.collection.CollectionUtils;
 import cn.newfeifan.mall.framework.mybatis.core.dataobject.BaseDO;
 import cn.newfeifan.mall.framework.mybatis.core.mapper.BaseMapperX;
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -9,10 +10,7 @@ import cn.newfeifan.mall.module.system.dal.dataobject.permission.RoleDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.lang.Nullable;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 @Mapper
 public interface RoleMapper extends BaseMapperX<RoleDO> {
@@ -39,7 +37,10 @@ public interface RoleMapper extends BaseMapperX<RoleDO> {
         return selectList(RoleDO::getStatus, statuses);
     }
 
-    default List<String> selectByRoleIds(Set<Long> roleIds){
+    default List<String> selectByRoleIds(Set<Long> roleIds) {
+        if (roleIds.isEmpty()) {
+            return Collections.emptyList();
+        }
         List<RoleDO> roleDOS = selectList(new LambdaQueryWrapperX<RoleDO>()
                 .inIfPresent(RoleDO::getId, roleIds));
         List<String> strings = new ArrayList<>();

+ 2 - 1
feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/service/permission/PermissionServiceImpl.java

@@ -231,7 +231,8 @@ public class PermissionServiceImpl implements PermissionService {
 
     @Override
     public Set<Long> getUserRoleIdListByUserId(Long userId) {
-        return convertSet(userRoleMapper.selectListByUserId(userId), UserRoleDO::getRoleId);
+        List<UserRoleDO> from = userRoleMapper.selectListByUserId(userId);
+        return convertSet(from, UserRoleDO::getRoleId);
     }
 
     @Override