|
|
@@ -150,6 +150,10 @@ public class OrganizationUserDaoImpl extends BaseImpl implements OrganizationUse
|
|
|
criteria.and("addType").is(param.getAddType());
|
|
|
}
|
|
|
|
|
|
+ if (StringUtils.isNotEmpty(param.getReViewUserId())) {
|
|
|
+ criteria.and("reviewUserId").is(param.getReViewUserId());
|
|
|
+ }
|
|
|
+
|
|
|
// 模糊搜索
|
|
|
List<Criteria> criterias = new ArrayList<>();
|
|
|
// 用户名称
|
|
|
@@ -167,6 +171,10 @@ public class OrganizationUserDaoImpl extends BaseImpl implements OrganizationUse
|
|
|
Pattern pattern = Pattern.compile("^.*" + param.getPhone() + ".*$");
|
|
|
criterias.add(Criteria.where("phone").is(pattern));
|
|
|
}
|
|
|
+ if (StringUtils.isNotEmpty(param.getReViewUserName())) {
|
|
|
+ Pattern pattern = Pattern.compile("^.*" + param.getReViewUserName() + ".*$");
|
|
|
+ criterias.add(Criteria.where("reViewUserName").is(pattern));
|
|
|
+ }
|
|
|
if (!CollectionUtils.isEmpty(criterias)) {
|
|
|
criteria.andOperator(criterias.toArray(new Criteria[]{}));
|
|
|
}
|