add

IM即时通讯

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

@@ -63,15 +63,16 @@ public class BizDeviceServiceImpl implements IBizDeviceService {
      */
     @Override
     public BizDeviceDetailVO queryDeviceDetail(String deviceId) {
+        BizDeviceDetailVO bizDeviceDetailVO = new BizDeviceDetailVO();
+
         BizDeviceAndClinicDetailQueryDTO query = new BizDeviceAndClinicDetailQueryDTO();
         query.setDeviceId(deviceId);
         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

@@ -58,7 +58,7 @@ public class CurrentUserController {
 
     @GetMapping("/listMenus-{portalId}")
     @ApiOperation("获得登录用户的菜单列表")
-    @TenantIgnore
+//    @TenantIgnore
     public CommonResult<List<RouteItemVO>> getMenus(@PathVariable(value = "portalId",required = false) String portalId) {
         SaTokenUtils.getStpUtil().checkLogin();
         return CommonResult.success(TreeUtil.buildTree(currentUserService.currentUserMenus(portalId)));
@@ -66,7 +66,7 @@ public class CurrentUserController {
 
     @GetMapping("/listPortal")
     @ApiOperation("获取登录用户的门户列表")
-    @TenantIgnore
+//    @TenantIgnore
     public CommonResult<List<SysUserPortalListDTO>> getPortals() {
         SaTokenUtils.getStpUtil().checkLogin();
         return CommonResult.success(currentUserService.currentUserPortals());

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/service/ISysUserRoleService.java

@@ -50,7 +50,7 @@ public interface ISysUserRoleService {
      * @param userId
      * @return
      */
-    @Cacheable(value = "sys:user:role",key = "#userId")
+//    @Cacheable(value = "sys:user:role",key = "#userId")
     List<SysRoleDTO> findAllRolesByUserId(String userId);
 
     /**