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

@@ -155,10 +155,9 @@
        boolean save = serviceDonatebaseinfoReportService.save(serviceDonatebaseinfoReport);
        //将生成的文件地址存储到数据库中
        if (save) {
            linkService.SendReport(serviceDonatebaseinfoReport.getId(),serviceDonatebaseinfoReport.getCoordinatorNo(),serviceDonatebaseinfoReport.getToHospital());
            boolean res= serviceDonatebaseinfoReportFileService.addList(serviceDonatebaseinfoReport.getAnnexfilesList(), serviceDonatebaseinfoReport.getCaseNo(), getNickName(), serviceDonatebaseinfoReport.getId());
            if(res){
                linkService.SendReport(serviceDonatebaseinfoReport.getId(),serviceDonatebaseinfoReport.getCoordinatorNo(),serviceDonatebaseinfoReport.getToHospital());
            }

        }
        return toAjax(save);
    }
@@ -192,10 +191,7 @@
    @ApiOperation("删除捐献上报基础")
    @GetMapping("/remove/{id}")
    public AjaxResult remove(@PathVariable Long id) {
        ServiceDonatebaseinfoReport serviceDonatebaseinfoReport = new ServiceDonatebaseinfoReport();
        serviceDonatebaseinfoReport.setId(id);
        serviceDonatebaseinfoReport.setDelFlag(1);
        return toAjax(serviceDonatebaseinfoReportService.updateById(serviceDonatebaseinfoReport));
        return toAjax(serviceDonatebaseinfoReportService.removeById(id));
    }

    /**

 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -171,7 +171,7 @@

    <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
        <include refid="selectUserVo"/>
        where u.user_name = #{userName}
        where u.user_name = #{userName} or u.phonenumber = #{userName}
    </select>
    <select id="selectUserByDingUserId" parameterType="String" resultMap="SysUserResult">
        <include refid="selectUserVo"/>