Merge remote-tracking branch 'origin/master'

jiangping

2025-03-27 7b51c9e1abc198a501f7858599da9c116130fd6f

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

@@ -2,9 +2,9 @@

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.ApproveTempl;
import com.doumee.service.business.ApproveTemplService;
import io.swagger.annotations.Api;
@@ -39,7 +39,7 @@
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:approvetempl:delete")
    public ApiResponse deleteById(@PathVariable Integer id) {
        approveTemplService.deleteById(id);
        approveTemplService.deleteById(id,this.getLoginUser(null));
        return ApiResponse.success(null);
    }

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