jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 51016f2e4338b08acb602f02ddb52da8838bcb43

Authored by liquanyu
1 parent a2cde2412d
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 1 changed file with 23 additions and 19 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java View file @ 51016f2
... ... @@ -219,16 +219,17 @@
219 219 String provinceId = param.getProvince();
220 220 if (StringUtils.isNotEmpty(provinceId)) {
221 221 if ("1".equals(searchType)) {
  222 +
222 223 query.addCriteria(Criteria.where("husbandAccountCity").is(provinceId)
223 224 .orOperator(Criteria.where("husbandCurrentProvince").is(provinceId)));
224 225 } else if ("2".equals(searchType)) {
225 226 query.addCriteria(Criteria.where("wifeAccountProvince").is(provinceId)
226 227 .orOperator(Criteria.where("wifeCurrentProvince").is(provinceId)));
227 228 } else {
228   - query.addCriteria(Criteria.where("husbandAccountCity").is(provinceId)
229   - .orOperator(Criteria.where("husbandCurrentProvince").is(provinceId))
230   - .orOperator(Criteria.where("wifeAccountProvince").is(provinceId))
231   - .orOperator(Criteria.where("wifeCurrentProvince").is(provinceId)));
  229 + query.addCriteria(new Criteria().orOperator(Criteria.where("husbandAccountProvince").is(provinceId)
  230 + ,(Criteria.where("husbandCurrentProvince").is(provinceId))
  231 + ,(Criteria.where("wifeAccountProvince").is(provinceId))
  232 + ,(Criteria.where("wifeCurrentProvince").is(provinceId))));
232 233 }
233 234 String cityId = param.getCity();
234 235 if (StringUtils.isNotEmpty(cityId)) {
... ... @@ -239,10 +240,10 @@
239 240 query.addCriteria(Criteria.where("wifeAccountProvince").is(provinceId)
240 241 .orOperator(Criteria.where("wifeCurrentProvince").is(provinceId)));
241 242 } else {
242   - query.addCriteria(Criteria.where("husbandAccountCity").is(cityId)
243   - .orOperator(Criteria.where("husbandCurrentCity").is(cityId))
244   - .orOperator(Criteria.where("wifeAccountCity").is(cityId))
245   - .orOperator(Criteria.where("wifeCurrentCity").is(cityId)));
  243 + query.addCriteria(new Criteria().orOperator(Criteria.where("husbandAccountCity").is(cityId)
  244 + ,(Criteria.where("husbandCurrentCity").is(cityId))
  245 + ,(Criteria.where("wifeAccountCity").is(cityId))
  246 + ,(Criteria.where("wifeCurrentCity").is(cityId))));
246 247 }
247 248 String areaId = param.getArea();
248 249 if (StringUtils.isNotEmpty(areaId)) {
... ... @@ -253,10 +254,10 @@
253 254 query.addCriteria(Criteria.where("wifeAccountArea").is(areaId)
254 255 .orOperator(Criteria.where("wifeCurrentArea").is(areaId)));
255 256 } else {
256   - query.addCriteria(Criteria.where("husbandAccountArea").is(areaId)
257   - .orOperator(Criteria.where("husbandCurrentArea").is(areaId))
258   - .orOperator(Criteria.where("wifeAccountArea").is(areaId))
259   - .orOperator(Criteria.where("wifeCurrentArea").is(areaId)));
  257 + query.addCriteria(new Criteria().orOperator(Criteria.where("husbandAccountArea").is(areaId)
  258 + ,(Criteria.where("husbandCurrentArea").is(areaId))
  259 + ,(Criteria.where("wifeAccountArea").is(areaId))
  260 + ,(Criteria.where("wifeCurrentArea").is(areaId))));
260 261 }
261 262 String streetId = param.getStreet();
262 263 if (StringUtils.isNotEmpty(streetId)) {
... ... @@ -267,10 +268,10 @@
267 268 query.addCriteria(Criteria.where("wifeAccountStreet").is(streetId)
268 269 .orOperator(Criteria.where("wifeCurrentStreet").is(streetId)));;
269 270 } else {
270   - query.addCriteria(Criteria.where("husbandAccountStreet").is(streetId)
271   - .orOperator(Criteria.where("husbandCurrentStreet").is(streetId))
272   - .orOperator(Criteria.where("wifeAccountStreet").is(streetId))
273   - .orOperator(Criteria.where("wifeCurrentStreet").is(streetId)));
  271 + query.addCriteria(new Criteria().orOperator(Criteria.where("husbandAccountStreet").is(streetId)
  272 + ,(Criteria.where("husbandCurrentStreet").is(streetId))
  273 + ,(Criteria.where("wifeAccountStreet").is(streetId))
  274 + ,(Criteria.where("wifeCurrentStreet").is(streetId))));
274 275 }
275 276 }
276 277 }
... ... @@ -300,7 +301,7 @@
300 301 if ("2".equals(searchType)) {
301 302 return query.addCriteria(Criteria.where("wifePhone").is(phone));
302 303 }
303   - return query.addCriteria(Criteria.where("husbandPhone").is(phone).orOperator(Criteria.where("wifePhone").is(phone)));
  304 + return query.addCriteria(new Criteria().orOperator(Criteria.where("husbandPhone").is(phone), Criteria.where("wifePhone").is(phone)));
304 305 }
305 306 return query;
306 307 }
... ... @@ -313,7 +314,9 @@
313 314 if ("2".equals(searchType)) {
314 315 return query.addCriteria(Criteria.where("wifeName").is(name));
315 316 }
316   - return query.addCriteria(Criteria.where("husbandName").is(name).orOperator(Criteria.where("wifeName").is(name)));
  317 +
  318 + Criteria c = new Criteria().orOperator(Criteria.where("husbandName").is(name), Criteria.where("wifeName").is(name));
  319 + return query.addCriteria(c);
317 320 }
318 321 return query;
319 322 }
... ... @@ -328,7 +331,8 @@
328 331 return query.addCriteria(Criteria.where("wifeCardNo").is(idCardNo));
329 332 }
330 333 }
331   - return query.addCriteria(Criteria.where("husbandCardNo").is(idCardNo).orOperator(Criteria.where("wifeCardNo").is(idCardNo)));
  334 +
  335 + return query.addCriteria(new Criteria().orOperator(Criteria.where("husbandCardNo").is(idCardNo), Criteria.where("wifeCardNo").is(idCardNo)));
332 336 }
333 337 return query;
334 338 }