Merge branch 'master' of http://gitabc.xyqb.com/head_group/xyqb-user2

src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

@@ -234,6 +234,7 @@ public class InnerController {
         for (Contact c : contacts) {
             c.setId(null);
             c.setUserId(userId);
+            c.setRelation(c.getRelation() == null ? Relation.OTHER : c.getRelation());
             c.setCreatedAt(now);
             c.setUpdateAt(now);
         }

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserDetailServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
 import javax.persistence.criteria.*;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -47,22 +48,21 @@ public class UserDetailServiceImpl implements IUserDetailService {
     }
 
     private Specification<UserDetail> getSpecification(String name, String phoneNo, String idNo) {
+        List<Predicate> list = new ArrayList<>();
         Specification<UserDetail> specification = new Specification<UserDetail>() {
             @Override
             public Predicate toPredicate(Root<UserDetail> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
                 if (!StringUtils.isEmpty(name)) {
-                    Path<String> namePath = root.get("name");
-                    criteriaQuery.where(criteriaBuilder.equal(namePath, name));
+                    list.add(criteriaBuilder.equal(root.get("name").as(String.class), name));
                 }
                 if (!StringUtils.isEmpty(phoneNo)) {
-                    Path<String> phonePath = root.get("phoneNo");
-                    criteriaQuery.where(criteriaBuilder.equal(phonePath, phoneNo));
+                    list.add(criteriaBuilder.equal(root.get("phoneNo").as(String.class), phoneNo));
                 }
                 if (!StringUtils.isEmpty(idNo)) {
-                    Path<String> idNoPath = root.get("idNo");
-                    criteriaQuery.where(criteriaBuilder.equal(idNoPath, idNo));
+                    list.add(criteriaBuilder.equal(root.get("idNo").as(String.class), idNo));
                 }
-                return null;
+                Predicate[] p = new Predicate[list.size()];
+                return criteriaBuilder.and(list.toArray(p));
             }
         };
         return specification;