fix

权限问题

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizDeviceServiceImpl.java

@@ -83,15 +83,16 @@ public class BizDeviceServiceImpl implements IBizDeviceService {
 
     @Override
     public BizDeviceDetailVO queryDeviceDetailByClinicId(String clinicId) {
+        BizDeviceDetailVO bizDeviceDetailVO = new BizDeviceDetailVO();
         BizDeviceAndClinicDetailQueryDTO query = new BizDeviceAndClinicDetailQueryDTO();
         query.setClinicId(clinicId);
         List<BizDeviceAndClinicDetailVO> bizDeviceAndClinicDetailVOS = bizDeviceRepository.selectDeviceDetailAndClinicList(query);
         if(ObjectUtil.isEmpty(bizDeviceAndClinicDetailVOS)){
-            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001, "泵信息不存在");
+            return bizDeviceDetailVO;
         }
         //因为一一对应所以数据只会有一条
         BizDeviceAndClinicDetailVO bizDeviceAndClinicDetailVO = bizDeviceAndClinicDetailVOS.get(0);
-        BizDeviceDetailVO bizDeviceDetailVO = new BizDeviceDetailVO();
+
         bizDeviceDetailVO.setClinicId(bizDeviceAndClinicDetailVO.getClinicRoomId());
         BizDeviceInfoVO bizDeviceInfoVO = BizInfusionHistoryMapper.INSTANCE.convertDeviceInfoVO(bizDeviceAndClinicDetailVO);
         bizDeviceDetailVO.setDeviceInfo(bizDeviceInfoVO);

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/oauth2/controller/CurrentUserController.java

@@ -50,7 +50,6 @@ public class CurrentUserController {
 
     @GetMapping("/getPermissionInfo")
     @ApiOperation( "获取登录用户的权限信息")
-    @TenantIgnore
     public CommonResult<Collection<String>> getPermissionInfo() {
         SaTokenUtils.getStpUtil().checkLogin();
         return CommonResult.success(currentUserService.currentUserPermission(String.valueOf(SaTokenUtils.getStpUtil().getLoginId())));

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/tenant/controller/SysTenantController.java

@@ -41,7 +41,6 @@ public class SysTenantController extends BaseController{
     @PostMapping("/query/page")
     @TenantIgnore
     public CommonResult<List<SysTenantCommonVO>> selectList(@RequestBody SysTenantQueryDTO query) {
-        query.setTenantId(LoginUserStrategy.tr.getTenantId());
         startPage();
         return CommonResult.success(sysTenantService.selectSysTenantList(query));
     }

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/tenant/dto/SysTenantQueryDTO.java

@@ -19,7 +19,4 @@ public class SysTenantQueryDTO {
     private Boolean disable;
     @ApiModelProperty(value = "套餐id",hidden = true)
     private String packageId;
-
-    @ApiModelProperty(hidden = true)
-    private String tenantId;
 }