Commit 7c415ff5 authored by hanfeng's avatar hanfeng

修改排序

parent 29ff8615
......@@ -265,7 +265,6 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
if (id == 1 || id == 14) {
return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "The label cannot be deleted");
}
//2.进行逻辑删除
VehicleModel vm = new VehicleModel();
vm.setId(id);
......@@ -282,17 +281,17 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
}
@ApiOperation("查询所有")
@RequestMapping(value = "/findAll", method = RequestMethod.GET)
@ResponseBody
public ObjectRestResponse findAll() {
VehicleModel vehicleModel = new VehicleModel();
vehicleModel.setIsdel(0);
return ObjectRestResponse.succ(baseBiz.selectList(vehicleModel));
}
// @ApiOperation("查询所有")
// @RequestMapping(value = "/findAll", method = RequestMethod.GET)
// @ResponseBody
// public ObjectRestResponse findAll() {
// VehicleModel vehicleModel = new VehicleModel();
// vehicleModel.setIsdel(0);
// return ObjectRestResponse.succ(baseBiz.selectList(vehicleModel));
// }
@ApiOperation("查询所有")
@RequestMapping(value = "/list", method = RequestMethod.GET)
@RequestMapping(value = "/findAll", method = RequestMethod.GET)
@ResponseBody
public ObjectRestResponse getList() {
Example exa = Example.builder(VehicleModel.class).where(
......@@ -349,7 +348,6 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
throw new BaseException(ResultCode.UPDATE_VEHICLE_FAIL);
}
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment