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

doum

6 天以前 dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4

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

@@ -1,11 +1,10 @@
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;
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.VisitReason;
import com.doumee.service.business.VisitReasonService;
import io.swagger.annotations.Api;
@@ -17,6 +16,7 @@

import java.util.ArrayList;
import java.util.List;
import com.doumee.api.BaseController;

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

@@ -55,7 +55,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        visitReasonService.deleteByIdInBatch(idList);
        visitReasonService.deleteByIdInBatch(idList,this.getLoginUser(null));
        return ApiResponse.success(null);
    }