sinake
8 天以前 c8fceb65958a1992d5b6df13f209a9da5ac121a1
手机号和工号同时可登
已修改2个文件
7 ■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java
@@ -192,10 +192,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"/>