suntianwu 3 anos atrás
pai
commit
5d7deb907a

+ 1 - 1
src/main/java/com/care/bms/controller/MemberInfoController.java

@@ -53,7 +53,7 @@ public class MemberInfoController {
             if(pageResponse != null){
                 return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
             } else {
-                return null;
+                return PageResult.error( "获取列表失败");
             }
 
         }catch (BDException e) {

+ 5 - 1
src/main/java/com/care/bms/controller/StationController.java

@@ -119,7 +119,11 @@ public class StationController {
     @ApiOperation(value = "服务站详情  --四期新增")
     public Result<StationVO> getStationInfo(@RequestHeader("token") String token,@PathVariable("stationId") Long stationId){
         StationVO vo = this.stationService.getStationInfo(stationId);
-        return  Result.success("查询成功!",vo);
+        if(vo !=null){
+            return  Result.success("查询成功!",vo);
+        } else {
+            return  Result.error("查询失败!");
+        }
     }
 
     @GetMapping("/listStation")

+ 7 - 1
src/main/java/com/care/bms/service/BmsMemberInfoService.java

@@ -84,7 +84,13 @@ public class BmsMemberInfoService {
                 }
                 return results;
             } else {
-                return null;
+                //空的
+                IPage<CareMemberInfo> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
+                QueryWrapper<CareMemberInfo> queryWrapper = new QueryWrapper<>();
+                queryWrapper.lambda().eq(CareMemberInfo::getId,0L);
+                IPage<CareMemberInfo> pageRes = this.careMemberInfoService.page(page, queryWrapper);
+                IPage<MemberInfoVO> results = new Page<>(pageRes.getCurrent(),pageRes.getSize(),pageRes.getTotal());
+                return results;
             }
 
     }

+ 4 - 1
src/main/java/com/care/bms/service/StationService.java

@@ -72,8 +72,11 @@ public class StationService {
     }
 
     public StationVO getStationInfo(Long stationId) {
-        StationVO vo = new StationVO();
         CareStation stationInfo = this.careStationService.getById(stationId);
+       if(stationInfo == null){
+           return null;
+       }
+        StationVO vo = new StationVO();
         BeanUtil.copyProperties(stationInfo,vo);
         QueryWrapper<CareDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(CareDevice::getStationId,stationId);