From 0945ca26ff623e4cbf61d32ddfb4c2bba16f1120 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 18:12:58 +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=E5=AF=BC=E5=85=A5=E8=BA=AB=E4=BB=BD=E8=AF=81?=
 =?UTF-8?q?=E5=8F=B7=E6=97=B6trim=E4=B8=80=E4=B8=8B=EF=BC=9B=20=E5=8C=BB?=
 =?UTF-8?q?=E7=96=97=E4=BA=92=E5=8A=A9=E7=B3=BB=E7=BB=9F-=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E5=8F=B0=E8=B4=A6=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?=
 =?UTF-8?q?=E7=A0=81=E6=94=AF=E6=8C=81=E7=B2=BE=E7=A1=AE=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=EF=BC=8C=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E7=A0=81=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E5=90=8E=E6=AD=A3=E5=88=99=E6=A0=A1=E9=AA=8C=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/SickFundListController.java        |  4 +++
 .../member/SickHelpMemberController.java      |  3 +-
 .../views/platform/sickHelp/member/list.html  | 29 ++++++++++++++++---
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/v/nutz/sickHelp/controller/member/SickFundListController.java b/src/main/java/io/v/nutz/sickHelp/controller/member/SickFundListController.java
index cf662e7..f9fa85f 100644
--- a/src/main/java/io/v/nutz/sickHelp/controller/member/SickFundListController.java
+++ b/src/main/java/io/v/nutz/sickHelp/controller/member/SickFundListController.java
@@ -132,6 +132,8 @@ public class SickFundListController {
         if (StrUtil.isNotBlank(keyWord)) {
             seg.orLike("sfm.loginName", keyWord);
             seg.orLike("sfm.userName", keyWord);
+            seg.or("sfm.idcard", "=", keyWord);
+            seg.or("u.idcard", "=", keyWord);
             cnd.and(seg);
         }
 
@@ -276,6 +278,8 @@ public class SickFundListController {
         if (StrUtil.isNotBlank(keyWord)) {
             seg.orLike("sfm.loginName", keyWord);
             seg.orLike("sfm.userName", keyWord);
+            seg.or("sfm.idcard", "=", keyWord);
+            seg.or("u.idcard", "=", keyWord);
             cnd.and(seg);
         }
         cnd.andEX("u.unionid", "=", unionId);
diff --git a/src/main/java/io/v/nutz/sickHelp/controller/member/SickHelpMemberController.java b/src/main/java/io/v/nutz/sickHelp/controller/member/SickHelpMemberController.java
index 421aa72..14db27a 100644
--- a/src/main/java/io/v/nutz/sickHelp/controller/member/SickHelpMemberController.java
+++ b/src/main/java/io/v/nutz/sickHelp/controller/member/SickHelpMemberController.java
@@ -85,6 +85,7 @@ public class SickHelpMemberController {
 //        Map<String, Long> collect = loginNames.stream().filter(v -> StrUtil.isNotBlank(v)).collect(Collectors.groupingBy(Function.identity(), Collectors.counting()));
 
         for (SickFundMember fundMember : list) {
+            fundMember.setIdcard(StrUtil.trim(fundMember.getIdcard()));
 //            Cnd cnd = Cnd.where("loginName", "=", fundMember.getLoginName());
 //            cnd.and("userName", "=", fundMember.getUserName());
 //            SickFundMember oldFundMember = dao.fetch(SickFundMember.class, cnd);
@@ -101,7 +102,7 @@ public class SickHelpMemberController {
                 fundMember.setUnitName(user.getString("unitname"));
                 fundMember.setSex(user.getString("sex"));
                 if (StrUtil.isBlank(fundMember.getIdcard())) {
-                    fundMember.setIdcard(user.getString("idcard"));
+                    fundMember.setIdcard(StrUtil.trim(user.getString("idcard")));
                 }
 //                fundMember.setIsMember(true);
             }
diff --git a/src/main/resources/views/platform/sickHelp/member/list.html b/src/main/resources/views/platform/sickHelp/member/list.html
index c78b903..32c0f1c 100644
--- a/src/main/resources/views/platform/sickHelp/member/list.html
+++ b/src/main/resources/views/platform/sickHelp/member/list.html
@@ -24,9 +24,9 @@ layout("/layouts/platform.html"){
                 </div>
 
                 <div class="search-item">
-                    <div class="search-item-label">工号姓名：</div>
+                    <div class="search-item-label">会员信息：</div>
                     <div class="search-item-option">
-                        <el-input clearable maxlength="10" placeholder="可输入会员的工号或姓名进行查询"
+                        <el-input clearable maxlength="50" placeholder="可输入会员的工号、姓名或身份证号进行查询"
                                   v-model.trim="pageForm.keyWord"></el-input>
                     </div>
                 </div>
@@ -148,7 +148,8 @@ layout("/layouts/platform.html"){
                 </el-radio-group>
             </el-form-item>
             <el-form-item label="身份证号" prop="idcard">
-                <el-input maxlength="50" v-model.trim="formData.idcard"></el-input>
+                <el-input @input="$refs.form.validateField('idcard')" maxlength="18"
+                          v-model.trim="formData.idcard"></el-input>
             </el-form-item>
 
             <el-form-item label="单位" prop="unitId">
@@ -197,6 +198,20 @@ layout("/layouts/platform.html"){
 
 </div>
 <script>
+    const idcardPattern = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+
+    const validateIdcard = (rule, value, callback) => {
+        if (!value) {
+            callback()
+            return
+        }
+        if (!idcardPattern.test(value)) {
+            callback(new Error('请输入正确的身份证号'))
+            return
+        }
+        callback()
+    }
+
     const vue = new Vue({
         el: '#app',
         mixins: [initTableMixins],
@@ -218,7 +233,7 @@ layout("/layouts/platform.html"){
                     loginName: [{required: true, message: '请输入工号', trigger: ['change', 'blur']}],
                     userName: [{required: true, message: '请输入姓名', trigger: ['change', 'blur']}],
                     // sex: [{required: true, message: '请选择性别', trigger: ['change', 'blur']}],
-                    idcard: [{required: false, message: '请输入身份证号', trigger: ['change', 'blur']}],
+                    idcard: [{validator: validateIdcard, trigger: ['change', 'blur']}],
                     unitName: [{required: false, message: '请输入单位', trigger: ['change', 'blur']}],
                     unitId: [{required: true, message: '请选择单位', trigger: ['change', 'blur']}],
                     isMember: [{required: true, message: '请选择是否会员', trigger: ['change', 'blur']}],
@@ -307,6 +322,12 @@ layout("/layouts/platform.html"){
                 })
             },
             async doHandle() {
+                const idcard = (this.formData.idcard || '').trim()
+                if (idcard && !idcardPattern.test(idcard)) {
+                    this.notifyWarning('请输入正确的身份证号')
+                    return
+                }
+                this.$set(this.formData, 'idcard', idcard || null)
                 const valid = await this.$refs.form.validate()
                 if (!valid) return
                 const url = this.formData.id ? '/doEdit' : '/doAdd'