党员详情

esua-epdc/epdc-gateway/pom.xml

@@ -92,12 +92,12 @@
 
                 <!-- gateway routes -->
                 <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
-                                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
-                <!--<gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>-->
+                <!--                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>-->
+                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>
                 <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
                 </gateway.routes.epdc-activiti-server.uri>
-                <!--<gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>-->
-                                <gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>
+                <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
+                <!--                <gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>-->
                 <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
                 <!--                <gateway.routes.epdc-app-server.uri>http://127.0.0.1:9058</gateway.routes.epdc-app-server.uri>-->
                 <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -22,7 +22,7 @@ import java.util.List;
  * @email yujintao@elink-cn.com
  * @date 2019/9/7 9:27
  */
-@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class,url = "http://localhost:9068")
+@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class)
 public interface UserFeignClient {
 
     /**

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -203,8 +203,8 @@
             eu.VILLAGE_NAME AS villageName,
             eu.DWELLING_PLACE as dwellingPlace,
             '1' as authenticatedFlag,
-            SUBSTRING_INDEX(epm.ALL_DEPT_NAMES,'-',-3) as streetName,
-            SUBSTRING_INDEX(epm.ALL_DEPT_NAMES,'-',-2)as communityName,
+            SUBSTRING_INDEX(SUBSTRING_INDEX(epm.ALL_DEPT_NAMES,'-',-3),'-',1) as streetName,
+            SUBSTRING_INDEX(SUBSTRING_INDEX(epm.ALL_DEPT_NAMES,'-',-2),'-',1)as communityName,
             SUBSTRING_INDEX(epm.ALL_DEPT_NAMES,'-',-1)  as gridName,
             eu.PARTY_FLAG as partyFlag,
             epm.CADRE_FLAG as cadreFlag,
@@ -233,8 +233,8 @@
             eu.VILLAGE_NAME AS villageName,
             eu.DWELLING_PLACE AS dwellingPlace,
             '0' AS authenticatedFlag,
-            SUBSTRING_INDEX(epaf.ALL_DEPT_NAMES,'-',-3) as streetName,
-            SUBSTRING_INDEX(epaf.ALL_DEPT_NAMES,'-',-2)as communityName,
+            SUBSTRING_INDEX(SUBSTRING_INDEX(epaf.ALL_DEPT_NAMES,'-',-3),'-',1) as streetName,
+            SUBSTRING_INDEX(SUBSTRING_INDEX(epaf.ALL_DEPT_NAMES,'-',-2),'-',1)as communityName,
             SUBSTRING_INDEX(epaf.ALL_DEPT_NAMES,'-',-1)  as gridName,
             eu.PARTY_FLAG AS partyFlag,
             epaf.CADRE_FLAG AS cadreFlag,
@@ -285,7 +285,7 @@
             <when test="gridId != null and gridId > 0">AND ug.GRID_ID = #{gridId}</when>
             <otherwise>
                 AND ug.GRID_ID in
-                    <foreach collection="gridIdList" item="item" open="(" separator="," close=")" >
+                <foreach collection="gridIdList" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </otherwise>
@@ -308,7 +308,7 @@
             <when test="gridId != null and gridId > 0">AND ug.GRID_ID = #{gridId}</when>
             <otherwise>
                 AND ug.GRID_ID in
-                    <foreach collection="gridIdList" item="item" open="(" separator="," close=")" >
+                <foreach collection="gridIdList" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </otherwise>