Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-09-18 6ef869b1adcf3a5bb8e4c3117dc507d173f13fd8

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

@@ -1,6 +1,5 @@
package com.doumee.api.business;

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;
@@ -14,9 +13,7 @@
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;
import com.doumee.api.BaseController;

/**
 * @author 江蹄蹄
@@ -42,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);
    }

@@ -50,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);
    }