From 51016f2e4338b08acb602f02ddb52da8838bcb43 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 31 Dec 2019 18:32:23 +0800 Subject: [PATCH] update --- .../web/service/impl/PreEugebicsServiceImpl.java | 42 ++++++++++++---------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java index 954349a..e64c7e6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java @@ -219,16 +219,17 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen String provinceId = param.getProvince(); if (StringUtils.isNotEmpty(provinceId)) { if ("1".equals(searchType)) { + query.addCriteria(Criteria.where("husbandAccountCity").is(provinceId) .orOperator(Criteria.where("husbandCurrentProvince").is(provinceId))); } else if ("2".equals(searchType)) { query.addCriteria(Criteria.where("wifeAccountProvince").is(provinceId) .orOperator(Criteria.where("wifeCurrentProvince").is(provinceId))); } else { - query.addCriteria(Criteria.where("husbandAccountCity").is(provinceId) - .orOperator(Criteria.where("husbandCurrentProvince").is(provinceId)) - .orOperator(Criteria.where("wifeAccountProvince").is(provinceId)) - .orOperator(Criteria.where("wifeCurrentProvince").is(provinceId))); + query.addCriteria(new Criteria().orOperator(Criteria.where("husbandAccountProvince").is(provinceId) + ,(Criteria.where("husbandCurrentProvince").is(provinceId)) + ,(Criteria.where("wifeAccountProvince").is(provinceId)) + ,(Criteria.where("wifeCurrentProvince").is(provinceId)))); } String cityId = param.getCity(); if (StringUtils.isNotEmpty(cityId)) { @@ -239,10 +240,10 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen query.addCriteria(Criteria.where("wifeAccountProvince").is(provinceId) .orOperator(Criteria.where("wifeCurrentProvince").is(provinceId))); } else { - query.addCriteria(Criteria.where("husbandAccountCity").is(cityId) - .orOperator(Criteria.where("husbandCurrentCity").is(cityId)) - .orOperator(Criteria.where("wifeAccountCity").is(cityId)) - .orOperator(Criteria.where("wifeCurrentCity").is(cityId))); + query.addCriteria(new Criteria().orOperator(Criteria.where("husbandAccountCity").is(cityId) + ,(Criteria.where("husbandCurrentCity").is(cityId)) + ,(Criteria.where("wifeAccountCity").is(cityId)) + ,(Criteria.where("wifeCurrentCity").is(cityId)))); } String areaId = param.getArea(); if (StringUtils.isNotEmpty(areaId)) { @@ -253,10 +254,10 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen query.addCriteria(Criteria.where("wifeAccountArea").is(areaId) .orOperator(Criteria.where("wifeCurrentArea").is(areaId))); } else { - query.addCriteria(Criteria.where("husbandAccountArea").is(areaId) - .orOperator(Criteria.where("husbandCurrentArea").is(areaId)) - .orOperator(Criteria.where("wifeAccountArea").is(areaId)) - .orOperator(Criteria.where("wifeCurrentArea").is(areaId))); + query.addCriteria(new Criteria().orOperator(Criteria.where("husbandAccountArea").is(areaId) + ,(Criteria.where("husbandCurrentArea").is(areaId)) + ,(Criteria.where("wifeAccountArea").is(areaId)) + ,(Criteria.where("wifeCurrentArea").is(areaId)))); } String streetId = param.getStreet(); if (StringUtils.isNotEmpty(streetId)) { @@ -267,10 +268,10 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen query.addCriteria(Criteria.where("wifeAccountStreet").is(streetId) .orOperator(Criteria.where("wifeCurrentStreet").is(streetId)));; } else { - query.addCriteria(Criteria.where("husbandAccountStreet").is(streetId) - .orOperator(Criteria.where("husbandCurrentStreet").is(streetId)) - .orOperator(Criteria.where("wifeAccountStreet").is(streetId)) - .orOperator(Criteria.where("wifeCurrentStreet").is(streetId))); + query.addCriteria(new Criteria().orOperator(Criteria.where("husbandAccountStreet").is(streetId) + ,(Criteria.where("husbandCurrentStreet").is(streetId)) + ,(Criteria.where("wifeAccountStreet").is(streetId)) + ,(Criteria.where("wifeCurrentStreet").is(streetId)))); } } } @@ -300,7 +301,7 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen if ("2".equals(searchType)) { return query.addCriteria(Criteria.where("wifePhone").is(phone)); } - return query.addCriteria(Criteria.where("husbandPhone").is(phone).orOperator(Criteria.where("wifePhone").is(phone))); + return query.addCriteria(new Criteria().orOperator(Criteria.where("husbandPhone").is(phone), Criteria.where("wifePhone").is(phone))); } return query; } @@ -313,7 +314,9 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen if ("2".equals(searchType)) { return query.addCriteria(Criteria.where("wifeName").is(name)); } - return query.addCriteria(Criteria.where("husbandName").is(name).orOperator(Criteria.where("wifeName").is(name))); + + Criteria c = new Criteria().orOperator(Criteria.where("husbandName").is(name), Criteria.where("wifeName").is(name)); + return query.addCriteria(c); } return query; } @@ -328,7 +331,8 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen return query.addCriteria(Criteria.where("wifeCardNo").is(idCardNo)); } } - return query.addCriteria(Criteria.where("husbandCardNo").is(idCardNo).orOperator(Criteria.where("wifeCardNo").is(idCardNo))); + + return query.addCriteria(new Criteria().orOperator(Criteria.where("husbandCardNo").is(idCardNo), Criteria.where("wifeCardNo").is(idCardNo))); } return query; } -- 1.8.3.1