Merge branch 'master' of http://111.47.6.224:3000/udream-cxs/lift-server

lift-batch-service/src/main/resources/bootstrap.yml

@@ -20,5 +20,5 @@ eureka:
     lease-expiration-duration-in-seconds: 20
   client:
     service-url:
-      defaultZone: http://172.16.24.142:10225/eureka/
+      defaultZone: http://192.168.1.121:10225/eureka/
 

lift-business-service/src/main/resources/bootstrap.yml

@@ -20,5 +20,5 @@ eureka:
     lease-expiration-duration-in-seconds: 20
   client:
     service-url:
-      defaultZone: http://172.16.24.142:10225/eureka/
+      defaultZone: http://192.168.1.121:10225/eureka/
 

lift-enterprise-service/src/main/resources/bootstrap.yml

@@ -20,4 +20,4 @@ eureka:
     lease-expiration-duration-in-seconds: 20
   client:
     service-url:
-      defaultZone: http://172.16.24.142:10225/eureka/
+      defaultZone: http://192.168.1.121:10225/eureka/

lift-push/src/main/resources/bootstrap.yml

@@ -20,5 +20,5 @@ eureka:
     lease-expiration-duration-in-seconds: 20
   client:
     service-url:
-      defaultZone: http://172.16.24.142:10225/eureka/
+      defaultZone: http://192.168.1.121:10225/eureka/
 

lift-quan-service/src/main/resources/bootstrap.yml

@@ -20,5 +20,5 @@ eureka:
     lease-expiration-duration-in-seconds: 20
   client:
     service-url:
-      defaultZone: http://172.16.24.142:10225/eureka/
+      defaultZone: http://192.168.1.121:10225/eureka/
 

lift-system-service/src/main/resources/bootstrap.yml

@@ -20,5 +20,5 @@ eureka:
     lease-expiration-duration-in-seconds: 20
   client:
     service-url:
-      defaultZone: http://172.16.24.142:10225/eureka/
+      defaultZone: http://192.168.1.121:10225/eureka/
 

lift-ud-service/src/main/java/cn/com/ty/lift/ud/recruitmentInfos/controller/query/RecruitmentInfoQuery.java

@@ -133,10 +133,9 @@ public final class RecruitmentInfoQuery extends BasePageQuery {
         }
         if (null != statuz) {
             query.eq("rinfo.statuz", statuz);
-        }
-        if (null != minSalary && null!= maxSalary) {
-            query.le("rinfo.upper_salary", maxSalary);
-            query.ge("rinfo.lower_salary", minSalary);
+        } 
+        if (null != minSalary && null != maxSalary) {
+            query.ge("rinfo.upper_salary", minSalary).le("rinfo.lower_salary", maxSalary);
         }
         if (null != minSalary && null== maxSalary) {
             query.ge("rinfo.lower_salary", minSalary);