改造商户权限, 如果是超级管理员查询所有权限

common/src/main/java/com/jumeirah/common/service/impl/MerchantUserServiceImpl.java

@@ -5,11 +5,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jumeirah.common.convert.UserConvert;
 import com.jumeirah.common.convert.UserConvert;
+import com.jumeirah.common.entity.MerchantPermission;
 import com.jumeirah.common.entity.MerchantUser;
 import com.jumeirah.common.entity.MerchantUser;
 import com.jumeirah.common.enums.StateEnum;
 import com.jumeirah.common.enums.StateEnum;
 import com.jumeirah.common.mapper.MerchantUserMapper;
 import com.jumeirah.common.mapper.MerchantUserMapper;
 import com.jumeirah.common.param.MerchantLoginParam;
 import com.jumeirah.common.param.MerchantLoginParam;
 import com.jumeirah.common.param.MerchantUserPageParam;
 import com.jumeirah.common.param.MerchantUserPageParam;
+import com.jumeirah.common.service.MerchantPermissionService;
 import com.jumeirah.common.service.MerchantUserPermissionService;
 import com.jumeirah.common.service.MerchantUserPermissionService;
 import com.jumeirah.common.service.MerchantUserService;
 import com.jumeirah.common.service.MerchantUserService;
 import com.jumeirah.common.vo.LoginMerUserTokenVo;
 import com.jumeirah.common.vo.LoginMerUserTokenVo;
@@ -37,6 +39,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
 import java.time.Duration;
 import java.time.Duration;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.Set;
 
 
 /**
 /**
@@ -60,8 +64,8 @@ public class MerchantUserServiceImpl extends BaseServiceImpl<MerchantUserMapper,
     @Autowired
     @Autowired
     private MerchantLoginRedisService merchantLoginRedisService;
     private MerchantLoginRedisService merchantLoginRedisService;
 
 
-//    @Autowired
-//    private MerchantPermissionService merchantPermissionService;
+    @Autowired
+    private MerchantPermissionService merchantPermissionService;
 
 
     @Autowired
     @Autowired
     private MerchantUserPermissionService merchantUserPermissionService;
     private MerchantUserPermissionService merchantUserPermissionService;
@@ -137,8 +141,18 @@ public class MerchantUserServiceImpl extends BaseServiceImpl<MerchantUserMapper,
 //        Set<String> permissionCodes = merchantRolePermissionService.getPermissionCodesByRoleId(roleId);
 //        Set<String> permissionCodes = merchantRolePermissionService.getPermissionCodesByRoleId(roleId);
 //        loginSysUserVo.setPermissionCodes(permissionCodes);
 //        loginSysUserVo.setPermissionCodes(permissionCodes);
 
 
+        // 如果是超级管理员查询所有权限
+        if (merchantUser.getIsAdmin().equals(1)) {
+            List<MerchantPermission> merchantPermissions = merchantPermissionService.list();
+            Set<String> permissionCodes = new HashSet<>();
+            for (MerchantPermission merchantPermission : merchantPermissions) {
+                permissionCodes.add(merchantPermission.getCode());
+            }
+            loginSysUserVo.setPermissionCodes(permissionCodes);
+        } else {
             Set<String> permissionCodes = merchantUserPermissionService.getPermissionCodesByUserId(merchantUser.getId());
             Set<String> permissionCodes = merchantUserPermissionService.getPermissionCodesByUserId(merchantUser.getId());
             loginSysUserVo.setPermissionCodes(permissionCodes);
             loginSysUserVo.setPermissionCodes(permissionCodes);
+        }
 
 
         // 获取数据库中保存的盐值
         // 获取数据库中保存的盐值
         String newSalt = SaltUtil.getSalt(merchantUser.getSalt(), jwtProperties);
         String newSalt = SaltUtil.getSalt(merchantUser.getSalt(), jwtProperties);
@@ -149,7 +163,7 @@ public class MerchantUserServiceImpl extends BaseServiceImpl<MerchantUserMapper,
         log.debug("token:{}", token);
         log.debug("token:{}", token);
 
 
         // 创建AuthenticationToken
         // 创建AuthenticationToken
-        JwtToken jwtToken = JwtToken.build(token, username, merchantUser.getId(), newSalt, expireSecond, LoginClientTypeEnum.MERCHANT.getType(),merchantUser.getMcId());
+        JwtToken jwtToken = JwtToken.build(token, username, merchantUser.getId(), newSalt, expireSecond, LoginClientTypeEnum.MERCHANT.getType(), merchantUser.getMcId());
 
 
         boolean enableShiro = springBootPlusProperties.getShiro().isEnable();
         boolean enableShiro = springBootPlusProperties.getShiro().isEnable();
         if (enableShiro) {
         if (enableShiro) {