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

# Conflicts:
#	epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffRoleDTO.java
#	epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserDTO.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffRoleEntity.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserEntity.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserWechatEntity.java

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffRoleDTO.java

@@ -83,4 +83,9 @@ public class StaffRoleDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffWechatDTO.java

@@ -128,4 +128,9 @@ public class StaffWechatDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserDTO.java

@@ -78,4 +78,9 @@ public class UserDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserWechatDTO.java

@@ -123,4 +123,9 @@ public class UserWechatDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectOrgRelationDTO.java

@@ -116,4 +116,9 @@ public class ProjectOrgRelationDTO implements Serializable {
      */
 	private String updatedBy;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectRelatedPersonnelDTO.java

@@ -103,4 +103,9 @@ public class ProjectRelatedPersonnelDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffRoleEntity.java

@@ -53,4 +53,9 @@ public class StaffRoleEntity extends BaseEpmetEntity {
      */
 	private String orgId;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffWechatEntity.java

@@ -93,4 +93,9 @@ public class StaffWechatEntity extends BaseEpmetEntity {
      */
 	private String language;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserEntity.java

@@ -48,4 +48,9 @@ public class UserEntity extends BaseEpmetEntity {
      */
 	private String fromClient;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserWechatEntity.java

@@ -93,4 +93,9 @@ public class UserWechatEntity extends BaseEpmetEntity {
      */
 	private String language;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectOrgRelationEntity.java

@@ -80,4 +80,9 @@ public class ProjectOrgRelationEntity extends BaseEpmetEntity {
      */
 	private String operation;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectRelatedPersonnelEntity.java

@@ -68,4 +68,9 @@ public class ProjectRelatedPersonnelEntity extends BaseEpmetEntity {
      */
 	private String userId;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java

@@ -241,7 +241,7 @@ public class AgencyServiceImpl implements AgencyService {
     public List<AreaCodeDictResultDTO> areaCodeDictTree(AreaCodeDictFormDTO formDTO) {
         Result<List<AreaCodeDictResultDTO>> listResult = commonServiceOpenFeignClient.areaCodeDictTree(formDTO);
         if (!listResult.success()){
-            throw new RenException(ScreenConstant.GET_AREA_TREE_FAILURE);
+            throw new RenException(listResult.getInternalMsg());
         }
         if (!CollectionUtils.isEmpty(listResult.getData())){
             return listResult.getData();

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/constant/AreaCodeConstant.java

@@ -24,4 +24,6 @@ public interface AreaCodeConstant {
 
     String ROOT_AGENCY_LEVEL_IS_LEVEL = "RootAreaLevel为空......";
 
+    String LEVEL_ERROR = "RootAreaLevel填写错误【%s】";
+
 }

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java

@@ -313,6 +313,8 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
             tree = disposeAfterTwoLevel(formDTO);
         }else if (formDTO.getRootAreaLevel().equals(AreaCodeConstant.PROVINCE) || formDTO.getRootAreaLevel().equals(AreaCodeConstant.CITY) || formDTO.getRootAreaLevel().equals(AreaCodeConstant.DISTRICT)){
             tree = disposeBeforeThreeLevelFinal(formDTO,tree);
+        }else {
+            throw new RenException(String.format(AreaCodeConstant.LEVEL_ERROR,formDTO.getRootAreaLevel()));
         }
         return tree;
     }

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleOperationDTO.java

@@ -84,4 +84,9 @@ public class RoleOperationDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleScopeDTO.java

@@ -88,4 +88,9 @@ public class RoleScopeDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationEntity.java

@@ -53,4 +53,9 @@ public class RoleOperationEntity extends BaseEpmetEntity {
      */
 	private String operationKey;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleScopeEntity.java

@@ -57,4 +57,9 @@ public class RoleScopeEntity extends BaseEpmetEntity {
      */
 	private String scopeKey;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectOrgRelationDTO.java

@@ -115,4 +115,9 @@ public class ProjectOrgRelationDTO implements Serializable {
      */
 	private String updatedBy;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectRelatedPersonnelDTO.java

@@ -103,4 +103,9 @@ public class ProjectRelatedPersonnelDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectOrgRelationEntity.java

@@ -85,4 +85,9 @@ public class ProjectOrgRelationEntity extends BaseEpmetEntity {
      */
 	private String operation;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectRelatedPersonnelEntity.java

@@ -72,4 +72,9 @@ public class ProjectRelatedPersonnelEntity extends BaseEpmetEntity {
 	 */
 	private String sourceId;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 }

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerHomeDetailDTO.java

@@ -98,4 +98,9 @@ public class CustomerHomeDetailDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerHomeDetailEntity.java

@@ -71,4 +71,9 @@ public class CustomerHomeDetailEntity extends BaseEpmetEntity {
      */
 	private Integer displayOrder;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffRoleDTO.java

@@ -83,6 +83,9 @@ public class StaffRoleDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
 
-	private String customerId;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffWechatDTO.java

@@ -129,4 +129,9 @@ public class StaffWechatDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserDTO.java

@@ -63,5 +63,9 @@ public class UserDTO implements Serializable{
      */
     private Date updatedTime;
 
+    /**
+     * 客户ID
+     */
     private String customerId;
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffRoleEntity.java

@@ -54,7 +54,8 @@ public class StaffRoleEntity extends BaseEpmetEntity {
 	private String orgId;
 
 	/**
-	 * 客户Id
+	 * 客户ID
 	 */
 	private String customerId;
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffWechatEntity.java

@@ -95,4 +95,9 @@ public class StaffWechatEntity extends BaseEpmetEntity {
      */
 	private String language;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserEntity.java

@@ -30,7 +30,7 @@ public class UserEntity extends BaseEpmetEntity {
     private String fromClient;
 
     /**
-     * 客户Id
+     * 客户ID
      */
     private String customerId;
 

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserWechatEntity.java

@@ -74,5 +74,10 @@ public class UserWechatEntity extends BaseEpmetEntity {
      */
     private String language;
 
+    /**
+     * 客户ID
+     */
     private String customerId;
+
+
 }