chengang 4 лет назад
Родитель
Сommit
0b2d66e7a0

+ 1 - 1
src/main/java/com/aoyang/tms/controller/ShipperController.java

@@ -82,7 +82,7 @@ public class ShipperController {
 
         log.info("添加托运方,调用/tms/shipper/add,参数:{}", JSON.toJSONString(param));
         if (param == null || param.getOrgId() == null || param.getOrgName() == null
-                || param.getOrgShortName() == null || param.getShipperName() == null) {
+                 || param.getShipperName() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         String utf8Name = userName;

+ 1 - 2
src/main/java/com/aoyang/tms/controller/TruckDeptController.java

@@ -83,8 +83,7 @@ public class TruckDeptController {
                       @RequestHeader(value = "userName") String userName,
                       @RequestBody TruckDept param) {
         log.info("新增运力部门,调用/tms/truck_dept/add,参数:{}", JSON.toJSONString(param));
-        if (param == null || param.getOrgId() == null || param.getName() == null || param.getOrgName() == null
-                || param.getOrgShortName() == null) {
+        if (param == null || param.getOrgId() == null || param.getName() == null || param.getOrgName() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         String utf8Name = userName;

+ 1 - 1
src/main/java/com/aoyang/tms/controller/WorkSpotController.java

@@ -83,7 +83,7 @@ public class WorkSpotController {
 
         log.info("添加作业点,调用/tms/work_spot/add,参数:{}", JSON.toJSONString(param));
         if (param == null || param.getOrgId() == null || param.getType() == null || param.getOrgName() == null
-                || param.getOrgShortName() == null || param.getSpotName() == null) {
+                || param.getSpotName() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         String utf8Name = userName;

+ 1 - 1
src/main/java/com/aoyang/tms/entity/TruckEscort.java

@@ -31,7 +31,7 @@ public class TruckEscort implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "用户id(tms.driver.user_id)")
-    @TableField("escort_id")
+    @TableId("escort_id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long userId;
 

+ 0 - 1
src/main/java/com/aoyang/tms/service/impl/TruckEscortServiceImpl.java

@@ -99,7 +99,6 @@ public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, Truck
             truckEscort.setCreateDate(param.getCreateDate());
             truckEscort.setOrgId(userSave.getOrgId());
             truckEscort.setOrgName(userSave.getOrgName());
-            truckEscort.setOrgShortName(userSave.getOrgShortName());
             truckEscort.setUpdater(param.getCreater());
             truckEscort.setUpdaterName(param.getCreaterName());
             truckEscort.setUpdateDate(param.getCreateDate());