// BUG 2892 导入机场单位没有持证类别和 人员性别 处理 by kongfm 2021-09-16

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -1037,19 +1037,19 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         if (ObjectUtils.isEmpty(ids)) {
             return null;
         }
-        return ids.stream().map(m -> {
+        List<CompanyPerson> tempList = new ArrayList<CompanyPerson>();
+        for(Long tempId : ids) {
             // BUG 2740 机场单位主键varchar 导致 通过主键搜索返回多条数据  2021 - 09 - 09by kongfm
-            OrgUsr org = getById(m.toString());
+            OrgUsr org = getById(tempId.toString());
             if (ObjectUtils.isEmpty(org)) {
-                return null;
+                continue;
             }
             CompanyPerson company = new CompanyPerson();
             BeanUtils.copyProperties(org, company);
             company.setPersons(this.queryForListByParentIdAndOrgType(org.getSequenceNbr(), OrgPersonEnum.人员.getKey()));
-            return company;
-        }).filter(c -> {
-            return c != null;
-        }).collect(Collectors.toList());
+            tempList.add(company);
+        }
+       return tempList;
     }
 
     // BUG 2736 人员导出过滤已经删除的数据by kongfm
@@ -1059,7 +1059,17 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
         
     public List<OrgUsrDto> queryForListByParentIdAndOrgType(Long parentId, String bizOrgType) {
-        return Bean.toModels(this.list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getIsDelete,false).eq(OrgUsr::getParentId,parentId).eq(OrgUsr::getBizOrgType,bizOrgType)), this.getModelClass());
+        // BUG 2843 过滤没有绑定关联账户的user by kongfm 2021-09-16
+        List<OrgUsr> tempUserList = this.list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getIsDelete,false).eq(OrgUsr::getParentId,parentId).eq(OrgUsr::getBizOrgType,bizOrgType).isNotNull(OrgUsr::getAmosOrgId));
+        tempUserList.stream().forEach(m -> {
+            if( StringUtils.isNotEmpty(m.getAmosOrgId())) {
+                FeignClientResult<AgencyUserModel> result1 = Privilege.agencyUserClient.queryByUserId(m.getAmosOrgId());
+                if(null !=result1.getResult()) {
+                    m.setAmosOrgCode(result1.getResult().getRealName());
+                }
+            }
+        });
+        return Bean.toModels(tempUserList,this.getModelClass());
     }
 
     public OrgUsrDto getOrg(String amosUserId) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -412,13 +412,11 @@ if (excelDtoList != null && excelDtoList.size() > 0) {
 
 				dynamicFormValue.forEach(dynamicFormInstanceDto -> {
 					switch (dynamicFormInstanceDto.getFieldCode()) {
-
 					case "administrativePositionCode":
 						if (orgUsrExcelDto.getAdministrativePositionCode() != null) {
 							String[] certificates = orgUsrExcelDto.getAdministrativePositionCode().split("@");
 							dynamicFormInstanceDto.setFieldValue(certificates[1]);
 							dynamicFormInstanceDto.setFieldValueLabel(certificates[0]);
-
 						}
 						break;
 					case "auditCycle":
@@ -440,23 +438,26 @@ if (excelDtoList != null && excelDtoList.size() > 0) {
 
 						}
 						break;
-					case "certificateType":
+					case "certificateType": //持证类别
 						if (orgUsrExcelDto.getCertificateType() != null) {
 							String[] certificates = orgUsrExcelDto.getCertificateType().split("@");
 							dynamicFormInstanceDto.setFieldValue(certificates[1]);
 							dynamicFormInstanceDto.setFieldValueLabel(certificates[0]);
-
 						}
+						break;  // BUG 2892 导入机场单位没有持证类别和 人员性别 处理 by kongfm 2021-09-16
 					case "fireManagementPostCode":
 						if (orgUsrExcelDto.getFireManagementPostCode() != null) {
 							String[] certificates = orgUsrExcelDto.getFireManagementPostCode().split("@");
 							dynamicFormInstanceDto.setFieldValue(certificates[1]);
 							dynamicFormInstanceDto.setFieldValueLabel(certificates[0]);
-
 						}
 						break;
 					case "gender":
-						dynamicFormInstanceDto.setFieldValue(orgUsrExcelDto.getGender());
+						if (orgUsrExcelDto.getGender() != null) {// BUG 2892 导入机场单位没有持证类别和 人员性别 处理 by kongfm 2021-09-16
+							String[] gender = orgUsrExcelDto.getGender().split("@");
+							dynamicFormInstanceDto.setFieldValue(gender[1]);
+							dynamicFormInstanceDto.setFieldValueLabel(gender[0]);
+						}
 						break;
 					case "internalPositionCode":
 						if (orgUsrExcelDto.getInternalPositionCode() != null) {

amos-boot-system-jcs/src/main/resources/application.properties

-spring.application.name=JCS
+spring.application.name=JCS-kfm
 server.servlet.context-path=/jcs
 server.port=11100
 spring.profiles.active=dev
@@ -70,7 +70,7 @@ jcs.company.topic.delete=jcs/company/topic/delete
 
 iot.fegin.name=AMOS-API-IOT
 
-equip.fegin.name=AMOS-EQUIPMANAGE
+equip.fegin.name=AMOS-EQUIPMANAGE-kfm
 
 ## 设备联动服务（车库门、广播、警铃）
 control.fegin.name=JCS-API-CONTROL