|
@@ -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 + "%");
|