代码提交

liusheng

2023-09-07 b113be4dfacb8ce58789b12e8beca6cd9ba8fb3c

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java

@@ -12,6 +12,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.tax.TaxtUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -98,6 +99,8 @@
    public TableDataInfo list(ServiceFund serviceFund) {
        startPage();
        //List<ServiceFund> list = serviceFundService.queryList(serviceFund);
        SysUser user = SecurityUtils.getLoginUser().getUser();
        serviceFund.setUsername(user.getNickName());
        List<ServiceFund> list = serviceFundService.selectServiceFundList(serviceFund);
        return getDataTable(list);
    }
@@ -632,7 +635,7 @@
    @ApiOperation("删除费用申请主")
    //@PreAuthorize("@ss.hasPermi('project:fund:remove')")
    @Log(title = "费用申请主", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceFundService.removeByIds(Arrays.asList(ids)));
    }

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java

@@ -101,6 +101,7 @@
    public TableDataInfo list(ServiceReimbursement serviceReimbursement) {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        serviceReimbursement.setCreateBy(user.getUserName());
        serviceReimbursement.setUsername(user.getNickName());
        startPage();
        List<ServiceReimbursement> list = serviceReimbursementService.queryList(serviceReimbursement);
        return getDataTable(list);