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"/>