瀏覽代碼

sz 姓名查询条件修改

xiao547607 5 年之前
父節點
當前提交
dc4102d316

+ 6 - 1
common/src/main/resources/mapper/base/PersonInfo.xml

@@ -169,8 +169,13 @@
                 and a.company_id = #{searchParams.companyId}
             </if>
             <if test="searchParams.name != null">
-                and a.name_ like #{searchParams.name}
+            <foreach item="name" collection="searchParams.name"  open="and" separator="or">
+                a.name_ like #{name}
+            </foreach>
             </if>
+<!--            <if test="searchParams.name != null">-->
+<!--                and a.name_ like #{searchParams.name}-->
+<!--            </if>-->
             <if test="searchParams.idCard != null">
                 and a.id_card like #{searchParams.idCard}
             </if>

+ 16 - 2
web/src/main/java/com/jpsoft/smart/modules/base/controller/PersonInfoController.java

@@ -319,8 +319,14 @@ public class PersonInfoController {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("a.id_","asc"));
 
+
         if (StringUtils.isNotEmpty(name)) {
-            searchParams.put("name","%" + name + "%");
+            String[] names = name.split(",");
+                List nameList = new ArrayList();
+                for (String n : names) {
+                    nameList.add("%"+ n +"%");
+                }
+                searchParams.put("name", nameList);
         }
         if (StringUtils.isNotEmpty(idCard)) {
             searchParams.put("idCard","%" + idCard + "%");
@@ -755,8 +761,16 @@ public class PersonInfoController {
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("a.id_","asc"));
             Map<String,Object> searchParams = new HashMap<>();
+//            if (StringUtils.isNotEmpty(name)) {
+//                searchParams.put("name","%" + name + "%");
+//            }
             if (StringUtils.isNotEmpty(name)) {
-                searchParams.put("name","%" + name + "%");
+                String[] names = name.split(",");
+                List nameList = new ArrayList();
+                for (String n : names) {
+                    nameList.add("%"+ n +"%");
+                }
+                searchParams.put("name", nameList);
             }
             if (StringUtils.isNotEmpty(idCard)) {
                 searchParams.put("idCard","%" + idCard + "%");