fix：切换角色问题

server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java

@@ -369,6 +369,7 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
 
     @Override
     public void editDeviceProperties(PlatDeviceAttrWechatDTO dto) {
+        log.info("写入设备属性请求参数:{}",JSON.toJSONString(dto));
         devicePropertiesOperateService.deviceWrite(dto.getDeviceId(), dto.getRadarMount(), dto.getRadarMode(), dto.getRadarHight());
 
         //更新区域设置设备安装方式

server-service/src/main/java/com/makeit/service/saas/impl/SaasUserServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
 import com.makeit.common.dto.LoginDTO;
 import com.makeit.common.dto.StatusDTO;
 import com.makeit.common.page.PageReqDTO;
@@ -16,6 +17,7 @@ import com.makeit.entity.saas.SaasUserRole;
 import com.makeit.entity.saas.PlatTenant;
 import com.makeit.enums.CodeMessageEnum;
 import com.makeit.enums.CommonEnum;
+import com.makeit.enums.HeaderConst;
 import com.makeit.enums.biz.auth.SysEnum;
 import com.makeit.enums.biz.auth.TenantEnum;
 import com.makeit.enums.id.IdConst;
@@ -36,6 +38,7 @@ import com.makeit.utils.data.convert.BeanDtoVoUtils;
 import com.makeit.utils.data.convert.PageUtil;
 import com.makeit.utils.data.convert.StreamUtil;
 import com.makeit.utils.data.id.IdGen;
+import com.makeit.utils.request.RequestUtil;
 import com.makeit.utils.user.PasswordUtils;
 import com.makeit.module.admin.vo.saas.SaasUserLoginVO;
 import com.makeit.utils.user.saas.SaasUserUtil;
@@ -373,12 +376,16 @@ implements SaasUserService{
             return userLoginVO;
         }
 
-
-        List<SaasUserRole> userRoleList = saasUserRoleService.list(new QueryWrapper<SaasUserRole>().lambda()
-                .eq(SaasUserRole::getUserId, userLoginVO.getId()));
-        List<String> roleIdList = StreamUtil.map(userRoleList, SaasUserRole::getRoleId);
+    /*    List<SaasUserRole> userRoleList = saasUserRoleService.list(new QueryWrapper<SaasUserRole>().lambda()
+                .eq(SaasUserRole::getUserId, userLoginVO.getId()));*/
+        List<String> roleIdList = Lists.newArrayList();
         roleIdList.add(-1 + "");
 
+        String currentRoleId = RequestUtil.getHeader(HeaderConst.ROLE_ID);
+        if (StringUtils.isNotBlank(currentRoleId)) {
+            roleIdList.add(currentRoleId);
+        }
+
         List<SaasRole> roleList = saasRoleService.list(new QueryWrapper<SaasRole>().lambda()
                 .in(SaasRole::getId, roleIdList)
                 .eq(SaasRole::getStatus, CommonEnum.YES.getValue())