diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/car/SysUserCarEntity.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/car/SysUserCarEntity.java index 77f2a4e03..4a488f790 100644 --- a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/car/SysUserCarEntity.java +++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/car/SysUserCarEntity.java @@ -35,7 +35,6 @@ public class SysUserCarEntity extends Model { * 用户ID */ @Schema(description = "用户ID") - @NotNull(message = "用户ID不能为空") private Long userId; /** diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/car/SysUserCarController.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/car/SysUserCarController.java index 0e8cb3084..cb7fd3829 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/car/SysUserCarController.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/car/SysUserCarController.java @@ -27,7 +27,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Objects; /** * 车辆管理 @@ -52,17 +51,18 @@ public class SysUserCarController { /* ************************************* start app start ************************************* */ @PostMapping("/app/create") - public void appCreateCar(@Validated @RequestBody SysUserCarDto dto) { + public R appCreateCar(@Validated @RequestBody SysUserCarDto dto) { PjcloudUser user = SecurityUtils.getUser(); dto.setUserId(user.getId()); sysUserCarService.appCreateCar(dto); + return R.ok(); } @PostMapping("/app/page") - public void appCarPage(@ParameterObject Page page, @ParameterObject SysUserCarDto dto) { + public R> appCarPage(@ParameterObject Page page, @ParameterObject SysUserCarDto dto) { PjcloudUser user = SecurityUtils.getUser(); dto.setUserId(user.getId()); - sysUserCarService.scopePageJoin(page, dto, null); + return R.ok(sysUserCarService.scopePageJoin(page, dto, null)); } /* ************************************* end app end ************************************* */ diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/car/SysUserCarServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/car/SysUserCarServiceImpl.java index b4d65dec3..8fcb712f2 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/car/SysUserCarServiceImpl.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/car/SysUserCarServiceImpl.java @@ -104,6 +104,7 @@ public class SysUserCarServiceImpl extends ServiceImpl