新增押运员log日志,部门删除成员为空判断

src/main/java/com/aoyang/tms/controller/TruckDeptController.java

@@ -108,8 +108,10 @@ public class TruckDeptController {
         if (param == null || param.getId() == null || param.getOrgId() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
-        if (commonService.findOrgTruckNumber(param.getOrgId(), param.getId()) != 0) {
-            return new Result<>(ErrCodeEnum.DEPARTMENT_EXIST_TRUCK.getCode(), ErrCodeEnum.DEPARTMENT_EXIST_TRUCK.getMessage());
+        if (commonService.findOrgTruckNumber(param.getOrgId(), param.getId()) != null) {
+            if (commonService.findOrgTruckNumber(param.getOrgId(), param.getId()) != 0){
+                return new Result<>(ErrCodeEnum.DEPARTMENT_EXIST_TRUCK.getCode(), ErrCodeEnum.DEPARTMENT_EXIST_TRUCK.getMessage());
+            }
         }
         return new Result<>(truckDeptService.removeById(param));
     }

src/main/java/com/aoyang/tms/controller/TruckEscortController.java

@@ -75,7 +75,7 @@ public class TruckEscortController {
     public Result add(@RequestHeader(value = "userId") Long userId,
                       @RequestHeader(value = "userName") String userName,
                       @RequestBody TruckEscortAddParam param) {
-        log.info("新增运力部门,调用/tms/truck_escort/add,参数:{}", JSON.toJSONString(param));
+        log.info("添加车辆押运员,调用/tms/truck_escort/add,参数:{}", JSON.toJSONString(param));
         if (param == null || param.getOrgId() == null || param.getEscortName() == null || param.getMobile() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }

src/main/java/com/aoyang/tms/service/impl/TruckEscortServiceImpl.java

@@ -1,5 +1,6 @@
 package com.aoyang.tms.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.aoyang.common.param.PageParam;
 import com.aoyang.tms.controller.param.TruckEscortAddParam;
 import com.aoyang.tms.controller.param.TruckEscortListParam;
@@ -13,6 +14,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -27,6 +29,7 @@ import java.util.List;
  * @since 2022-04-20
  */
 @Service
+@Slf4j
 public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, TruckEscort> implements TruckEscortService {
 
     @Resource
@@ -88,8 +91,10 @@ public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, Truck
         user.setCreaterName(param.getCreaterName());
         user.setCreateDate(param.getCreateDate());
         User userSave = commonService.addUser(user);
+        log.info("添加新的user,参数:{}", JSON.toJSONString(userSave));
 
         if (userSave != null) {
+            log.info("添加新的user,参数:{}", JSON.toJSONString(userSave));
             TruckEscort truckEscort = new TruckEscort();
             truckEscort.setUserId(userSave.getUserId());
             truckEscort.setEscortName(userSave.getUserName());