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 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"){
-
工号姓名:
+
会员信息:
-
@@ -148,7 +148,8 @@ layout("/layouts/platform.html"){ - + @@ -197,6 +198,20 @@ layout("/layouts/platform.html"){