Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop

# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java

@@ -145,7 +145,8 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
                         if (!r.getAddStatus()){
                             // 集合里重复的
                             nums.add(r.getNum());
-                            disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                            BuildingInfoModel buildingInfoModel = ConvertUtils.sourceToTarget(r, BuildingInfoModel.class);
+                            disposeErrorMsg(buildingInfoModel,ImportErrorMsgConstants.EXIST_ERROR);
                             r.setExistStatus(true);
                             r.setAddStatus(true);
                         }
@@ -163,7 +164,8 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
                 existList.forEach(e -> {
                     if (!e.getAddStatus()){
                         nums.add(e.getNum());
-                        disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                        BuildingInfoModel buildingInfoModel = ConvertUtils.sourceToTarget(e, BuildingInfoModel.class);
+                        disposeErrorMsg(buildingInfoModel,ImportErrorMsgConstants.EXIST_ERROR);
                         e.setAddStatus(true);
                     }
                 });

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java

@@ -139,7 +139,8 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
                         if (!r.getAddStatus()){
                             // 集合里重复的
                             nums.add(r.getNum());
-                            disposeErrorMsg(info, ImportErrorMsgConstants.EXIST_ERROR);
+                            NeighborHoodInfoModel neighborHoodInfoModel = ConvertUtils.sourceToTarget(r, NeighborHoodInfoModel.class);
+                            disposeErrorMsg(neighborHoodInfoModel, ImportErrorMsgConstants.EXIST_ERROR);
                             r.setExistStatus(true);
                             r.setAddStatus(true);
                         }
@@ -157,7 +158,8 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
                 existList.forEach(e -> {
                     if (!e.getAddStatus()){
                         nums.add(e.getNum());
-                        disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                        NeighborHoodInfoModel neighborHoodInfoModel = ConvertUtils.sourceToTarget(e, NeighborHoodInfoModel.class);
+                        disposeErrorMsg(neighborHoodInfoModel,ImportErrorMsgConstants.EXIST_ERROR);
                         e.setAddStatus(true);
                     }
                 });

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -770,7 +770,7 @@
             cg.ABANDON_FLAG
         FROM
             customer_grid cg
-        INNER JOIN customer_agency ca ON ca.pid = '0' AND ca.customer_id = cg.customer_id
+        INNER JOIN customer_agency ca ON (ca.ID = cg.PID AND ca.customer_id = cg.customer_id)
         WHERE
             cg.del_flag = '0'
         AND ca.del_flag = '0'