From 5c61ec443a38c5ea8ac8dcbf606acfccc8cf6c7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=AD=A6=E6=88=90?= <1274337408@qq.com> Date: Sun, 20 Sep 2026 17:27:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E7=96=97=E4=BA=92=E5=8A=A9=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=EF=BC=9A=E4=BF=AE=E5=A4=8D=E2=80=98=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=A1=A5=E5=8A=A9=E8=AE=B0=E5=BD=95=E2=80=99=E7=9A=84=E5=B7=A5?= =?UTF-8?q?=E5=8F=B7=E6=90=9C=E7=B4=A2=E6=97=B6=EF=BC=8C=E5=88=97=E5=90=8D?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sickHelp/service/impl/SickHelpImportServiceImpl.java | 2 +- src/main/resources/views/platform/sickHelp/import/form.html | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/v/nutz/sickHelp/service/impl/SickHelpImportServiceImpl.java b/src/main/java/io/v/nutz/sickHelp/service/impl/SickHelpImportServiceImpl.java index 536bbaf..764c7eb 100644 --- a/src/main/java/io/v/nutz/sickHelp/service/impl/SickHelpImportServiceImpl.java +++ b/src/main/java/io/v/nutz/sickHelp/service/impl/SickHelpImportServiceImpl.java @@ -180,7 +180,7 @@ public class SickHelpImportServiceImpl extends ViServiceImpl implement Cnd cnd = Cnd.where(Cnd.likeEX("m.userName", key)).or(Cnd.likeEX("m.loginName", key)); cnd.or(Cnd.likeEX("m.idcard", key)).or(Cnd.likeEX("u.idcard", key)); - Sql sql = Sqls.create("select m.*, IFNULL(NULLIF(m.idcard, ''), u.idcard) AS idcard from sick_fund_member m left join user u on u.loginname = m.loginName $condition"); + Sql sql = Sqls.create("select m.*, IFNULL(NULLIF(m.idcard, ''), u.idcard) AS effectiveIdcard from sick_fund_member m left join user u on u.loginname = m.loginName $condition"); sql.setCondition(cnd); Pagination pagination = listPageMap(1, 10, sql); return pagination.getList(); diff --git a/src/main/resources/views/platform/sickHelp/import/form.html b/src/main/resources/views/platform/sickHelp/import/form.html index 057e1c8..85dc0f4 100644 --- a/src/main/resources/views/platform/sickHelp/import/form.html +++ b/src/main/resources/views/platform/sickHelp/import/form.html @@ -90,7 +90,7 @@ layout("/layouts/platform.html"){ v-model="formData.loginName"> @@ -382,7 +382,7 @@ layout("/layouts/platform.html"){ this.$set(this.formData, 'userName', user.userName) this.$set(this.formData, 'unitName', user.unitName) this.$set(this.formData, 'loginName', user.loginName) - this.$set(this.formData, 'idcard', user.idcard) + this.$set(this.formData, 'idcard', user.effectiveIdcard) await this.getHistoryApplyRecords(user.loginName, this.formData.year) }, async getHistoryApplyRecords(loginName, year) { @@ -409,7 +409,7 @@ layout("/layouts/platform.html"){ resp.data.year = resp.data.year.toString() this.formData = resp.data const user = this.userList.find(v => v.loginName === loginName) - this.$set(this.formData, 'idcard', user ? user.idcard : null) + this.$set(this.formData, 'idcard', user ? user.effectiveIdcard : null) await this.getHistoryApplyRecords(loginName, this.formData.year) } },