Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

2025-09-26 dd4cd96c69061da3ff80cbfb87237b16cda8abc3

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarDriverController.java

@@ -3,9 +3,9 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.CarDriver;
import com.doumee.service.business.CarDriverService;
import io.swagger.annotations.Api;
@@ -14,9 +14,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;

import java.util.ArrayList;
import java.util.List;

/**
 * @author 江蹄蹄
@@ -42,7 +39,7 @@
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:cardriver:delete")
    public ApiResponse deleteById(@PathVariable Integer id) {
        carDriverService.deleteById(id);
        carDriverService.deleteById(id,this.getLoginUser(null));
        return ApiResponse.success(null);
    }

@@ -50,7 +47,7 @@
    @GetMapping("/delete/batch")
    @RequiresPermissions("business:cardriver:delete")
    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
        carDriverService.deleteByIdInBatch(this.getIdList(ids));
        carDriverService.deleteByIdInBatch(this.getIdList(ids),this.getLoginUser(null));
        return ApiResponse.success(null);
    }