修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/excel/ExcelUtil.java

@@ -167,14 +167,18 @@ public class ExcelUtil {
 					String[] postTypeNamestrings = new String[postTypeNameDetailList.size()];
 					List<String> userNameDetailList = (List<String>) detail.get(detail.size()-3);
 					String[] userNamestrings = new String[userNameDetailList.size()];
+					List<String> companyNameList = (List<String>) detail.get(detail.size()-4);
+					String[] companyNameLists = new String[companyNameList.size()];
 					map.put(4, fireStationDetailList.toArray(strings));
 					map.put(3, postTypeNameDetailList.toArray(postTypeNamestrings));
 					map.put(2, userNameDetailList.toArray(userNamestrings));
+					map.put(1, companyNameList.toArray(companyNameLists));
 					map.putAll(explicitListConstraintMap);
 					fireStationExplicitListConstraintMap.add(map);
 					detail.remove(detail.size()-1);
 					detail.remove(detail.size()-1);
 					detail.remove(detail.size()-1);
+					detail.remove(detail.size()-1);
 					resultList.add(detail);
 				});
 				excelWriterSheetBuilder

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

@@ -122,11 +122,16 @@ public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements ID
 
 	public List< Map<String, Object>> getFirstAidExportData(List<String> ids) {
 		List< Map<String, Object>> resultList = new ArrayList<Map<String, Object>>();
+		List< Map<String, Object>> result = new ArrayList<Map<String, Object>>();
+		List<String> userNameList= new ArrayList<String>();
+
+		List<String> firstAidSimpleList = new ArrayList<String>();
+		List<String> companyNameList = new ArrayList<String>();
 		String typeString = "JJZ";
 		ids.stream().forEach(i->{
 			Map<String, Object> detailMap = new HashMap<String, Object>();
 			List<OrgUsr> personList = orgUsrServiceImpl.getPersonListByParentId(Long.parseLong(i));
-			List<String> userNameList= new ArrayList<String>();
+
 			personList.stream().forEach(m -> {
 				String userNameString =m.getBizOrgName()+ "@" +m.getSequenceNbr();
 				userNameList.add(userNameString);
@@ -134,28 +139,29 @@ public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements ID
 			detailMap.put("userName", userNameList);
 			OrgUsr companyDetail =	orgUsrServiceImpl.getDetailById(Long.parseLong(i));
 			String companyNameString = companyDetail.getBizOrgName()+ "@" +companyDetail.getSequenceNbr();
-			detailMap.put("companyName", companyNameString);
+			companyNameList.add(companyNameString);
+			detailMap.put("companyName", companyNameList);
 			List<DataDictionary>  dataDicList=	dataDictionaryService.getByType(typeString);
 			List<String> dataDicSimpleList = new ArrayList<String>();
-			dataDicList.stream().forEach(l->{
-				String dataDic = l.getName() + "@" +l.getCode();
-				dataDicSimpleList.add(dataDic);
-			});
+				dataDicList.stream().forEach(l->{
+					String dataDic = l.getName() + "@" +l.getCode();
+					dataDicSimpleList.add(dataDic);
+				});
+
 			detailMap.put("postTypeName",dataDicSimpleList);
 			List<Map<String, Object>> list = dutyPersonShiftMapper.getFirstAidForTypeCodeAndCompanyId(
 					Long.parseLong(i));
-			
-			List<String> firstAidSimpleList = new ArrayList<String>();
 			list.stream().forEach(m -> {
 				String firstAidNameString = m.get("name").toString() + "@" + m.get("sequence_nbr").toString();
 				firstAidSimpleList.add(firstAidNameString);
 			});
-			if( firstAidSimpleList != null && firstAidSimpleList.size() > 1 ) {
+			if( firstAidSimpleList != null && firstAidSimpleList.size() >= 1 ) {
 				detailMap.put("firstAidName", firstAidSimpleList);
 				resultList.add(detailMap);
 			}
 		});
-		return resultList;
+		result.add(resultList.get(0));
+		return result;
 	}
 
 }

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

@@ -1174,10 +1174,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     public String getParentId(String amosOrgId) {
-        List<OrgUsrDto> orgUsrDtos = queryForList("", false, amosOrgId);
+		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(BaseEntity::getIsDelete,false);
+		wrapper.eq(OrgUsr::getAmosOrgId,amosOrgId);
+		List<OrgUsr> orgUsrs = orgUsrMapper.selectList(wrapper);
+
         String parentId = null;
-        if (orgUsrDtos.size() >= 1) {
-            parentId = orgUsrDtos.get(0).getParentId();
+        if (orgUsrs.size() >= 1) {
+            parentId = orgUsrs.get(0).getParentId();
         } else {
             return null;
         }
@@ -1239,7 +1243,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         // 业主单位人员
         List<UserUnitDto> list = orgUsrMapper.getUserUnit(userId, typeArr[0], null);
         // 维保单位人员
-        List<MaintenanceCompany> maintenancePersons = maintenanceCompanyService.findPersonByAmosOrgId(typeArr[0], userId);
+     //   maintenanceCompanyService.findPerssonByAmosOrgId(typeArr[0], userId);
+        List<MaintenanceCompany> maintenancePersons = null;
         if (!CollectionUtils.isEmpty(list) && !CollectionUtils.isEmpty(maintenancePersons)) {
             throw new RuntimeException("人员绑定单位重复！");
         }