Merge remote-tracking branch 'origin/dev_1118' into dev_1118

# Conflicts:
#	esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java
#	esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java

@@ -122,7 +122,7 @@ public class EpdcEventsEntity extends BaseEpdcEntity {
      */
 	private String issueAddress;
     /**
-     * 议题分类ID
+     * 议题分类编码
      */
 	private String categoryCode;
     /**
@@ -174,9 +174,9 @@ public class EpdcEventsEntity extends BaseEpdcEntity {
 	private String topicId;
 
 	/**
-	 * 一级分类ID
+	 * 一级分类编码
 	 */
-	private String firstcategoryCode;
+	private String firstCategoryCode;
 
 	/**
 	 * 分类全称

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueEntity.java

@@ -141,7 +141,7 @@ public class IssueEntity extends BaseEpdcEntity {
 	private String issueAddress;
 
     /**
-     * 议题分类ID
+     * 议题分类编码
      */
 	private String categoryCode;
 
@@ -175,9 +175,9 @@ public class IssueEntity extends BaseEpdcEntity {
 	 */
 	private String topicId;
 	/**
-	 * 一级分类ID
+	 * 一级分类编码
 	 */
-	private String firstcategoryCode;
+	private String firstCategoryCode;
 
 	/**
 	 * 分类全称

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java

@@ -141,7 +141,7 @@ public class ItemEntity extends BaseEpdcEntity {
     private String issueAddress;
 
     /**
-     * 议题分类ID
+     * 议题分类编码
      */
     private String categoryCode;
 
@@ -198,9 +198,9 @@ public class ItemEntity extends BaseEpdcEntity {
      */
     private String topicId;
     /**
-     * 一级分类ID
+     * 一级分类编码
      */
-    private String firstcategoryCode;
+    private String firstCategoryCode;
 
     /**
      * 分类全称

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

@@ -193,12 +193,12 @@
             eu.VILLAGE_NAME AS villageName,
             eu.DWELLING_PLACE as dwellingPlace,
             '1' as authenticatedFlag,
-            eu.STREET as streetName,
+            SUBSTRING_INDEX(eu.ALL_DEPT_NAMES,'-',1) as streetName,
-            eu.COMMUNITY as communityName,
+            SUBSTRING_INDEX(SUBSTRING_INDEX(eu.ALL_DEPT_NAMES,'-',2),'-',-1)as communityName,
-            eu.GRID as gridName,
+            SUBSTRING_INDEX(eu.ALL_DEPT_NAMES,'-',-1)  as gridName,
             eu.PARTY_FLAG as partyFlag,
             epm.CADRE_FLAG as cadreFlag,
-            CONCAT_WS('-',eugr.STREET,eugr.COMMUNITY,eugr.GRID) as completeName,
+            eu.ALL_DEPT_NAMES as completeName,
             eugr.LEADER_FLAG as leaderFlag,
             eut.TAG_NAME as tagName
         FROM