Merge branch 'dev' into dev_temp

# Conflicts:
#	epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
#	epmet-module/epmet-third/epmet-third-server/pom.xml
#	epmet-module/oper-crm/oper-crm-server/pom.xml

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.132
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.134
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.132</version>
+    <version>0.0.134</version>
 
     <parent>
         <groupId>com.epmet</groupId>

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java

@@ -408,20 +408,23 @@ public class CodeServiceImpl implements CodeService {
 	@Override
 	public List<ReasonResultDTO> reason(CodeCommonFormDTO formDTO) {
 		List<ReasonResultDTO> resultList = new ArrayList<>();
-
-		//获取上传代码信息
-		CodeCustomerDTO codeCustomerDTO = codeCustomerService.get(formDTO.getCodeId());
+		if (StringUtils.isNotBlank(formDTO.getCodeId())) {
+			//获取上传代码信息
+			CodeCustomerDTO codeCustomerDTO = codeCustomerService.get(formDTO.getCodeId());
+			formDTO.setCustomerId(codeCustomerDTO.getCustomerId());
+			formDTO.setClientType(codeCustomerDTO.getClientType());
+		}
 		//是否授权
-		if (!customerMpService.getAuthFlag(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType())) {
+		if (!customerMpService.getAuthFlag(formDTO.getCustomerId(), formDTO.getClientType())) {
 			throw new RenException("未授权");
 		}
-		AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType());
+		AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), formDTO.getClientType());
 		if (null == authInfo) {
 			throw new RenException("未授权");
 		}
 		//获取审核结果信息
-		List<CodeAuditResultDTO> codeAuditResultList = codeAuditResultService.getAuditFailedList(codeCustomerDTO.getCustomerId(),
-				codeCustomerDTO.getClientType());
+		List<CodeAuditResultDTO> codeAuditResultList = codeAuditResultService.getAuditFailedList(formDTO.getCustomerId(),
+				formDTO.getClientType());
 		codeAuditResultList.forEach(dto -> {
 			ReasonResultDTO result = new ReasonResultDTO();
 			result.setReason(dto.getReason());
@@ -500,9 +503,9 @@ public class CodeServiceImpl implements CodeService {
 	public PageData history(CodeCommonFormDTO formDTO) {
 		PageHelper.startPage(formDTO.getPage(), formDTO.getLimit());
 		//获取上传代码信息
-		CodeCustomerDTO code = codeCustomerService.get(formDTO.getCodeId());
+//		CodeCustomerDTO code = codeCustomerService.get(formDTO.getCodeId());
 		//获取上传代码信息
-		List<CodeHistoryResultDTO> list = codeOperationHistoryService.getHistoryList(code.getCustomerId(), code.getClientType());
+		List<CodeHistoryResultDTO> list = codeOperationHistoryService.getHistoryList(formDTO.getCustomerId(), formDTO.getClientType());
 		PageInfo<CodeHistoryResultDTO> pageInfo = new PageInfo<>(list);
 		return new PageData<>(list, pageInfo.getTotal());
 	}

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

@@ -51,7 +51,11 @@ public class ProjectDetailResultDTO implements Serializable {
 	/**
 	 * 当前跟进部门
 	 */
-	private List<DepartmentNameListBean> departmentNameList;
+	private List<String> departmentNameList;
+	/**
+	 * 当前跟进部门
+	 */
+	private List<DepartmentNameListBean> departmentList;
 
 	@NoArgsConstructor
 	@Data

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -280,11 +280,13 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		}
 
 		//获取当前跟进部门
+		List<String> departments = new ArrayList<>();
 		List<ProjectStaffDTO> departmentNameList = new ArrayList<>();
 		List<ProjectDetailResultDTO.DepartmentNameListBean> departmentList = new ArrayList<>();
 		if (ProjectConstant.CLOSED.equals(resultDTO.getProjectStatus())) {
 			//项目已结案，跟进部门为空
-			resultDTO.setDepartmentNameList(departmentList);
+			resultDTO.setDepartmentList(departmentList);
+			resultDTO.setDepartmentNameList(departments);
 		} else {
 			//项目未结案，找出所有跟进部门
 			ProjectDTO projectDTO = new ProjectDTO();
@@ -313,8 +315,10 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 								staffDto.getStaffId().equals(staffInfo.getStaffId())).map((StaffSinGridResultDTO::getStaffName))).collect(Collectors.toList());
 				bean.setStaffList(staffNameList);
 				departmentList.add(bean);
+				departments.add(departmentName);
 			}
-			resultDTO.setDepartmentNameList(departmentList);
+			resultDTO.setDepartmentList(departmentList);
+			resultDTO.setDepartmentNameList(departments);
 		}
 
 		return resultDTO;

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java

@@ -460,19 +460,7 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
         customerEntity.setOrganizationNumber("");
         customerEntity.setOrganizationImg("");
         customerEntity.setValidityTime(getValidityTime());
-        String level = "5";
-        if("province".equals(paAgency.getLevel())){
-            level = "0";
-        }else if("city".equals(paAgency.getLevel())){
-            level = "1";
-        }else if("district".equals(paAgency.getLevel())){
-            level = "2";
-        }else if("street".equals(paAgency.getLevel())){
-            level = "3";
-        }else if("community".equals(paAgency.getLevel())){
-            level = "4";
-        }
-        customerEntity.setOrganizationLevel(level);
+        customerEntity.setOrganizationLevel(paAgency.getLevel());
         customerEntity.setLogo("");
         //新客户默认可以创建三个网格
         customerEntity.setGridNumber(NumConstant.THREE);