修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DutyFirstAidExcleDto.java

@@ -31,8 +31,8 @@ public class DutyFirstAidExcleDto implements Serializable{
 	@ExcelIgnore
 	@ApiModelProperty(value = "用户id")
 	private String userId;
-	@ExcelProperty(value = "用户名称", index = 2)
-	@ApiModelProperty(value = "用户名称")
+	@ExcelProperty(value = "值班人员", index = 2)
+	@ApiModelProperty(value = "值班人员")
 	private String userName;
 
 	@ExcelIgnore

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

@@ -124,27 +124,33 @@ public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements ID
 		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 firstAidCompanyId = dutyPersonShiftMapper.getFirstAidCompanyId();
 		if (firstAidCompanyId != "" && firstAidCompanyId != null){
 			ids.add(firstAidCompanyId);
+			OrgUsr companyDetail =	orgUsrServiceImpl.getDetailById(Long.parseLong(firstAidCompanyId));
+			String companyNameString = companyDetail.getBizOrgName()+ "@" +companyDetail.getSequenceNbr();
+			companyNameList.add(companyNameString);
 		}
-		
-		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));
+			if (!i.equals(firstAidCompanyId)){
+				List<OrgUsr> personList = orgUsrServiceImpl.getPersonListByParentId(Long.parseLong(i));
+				personList.stream().forEach(m -> {
+					String userNameString =m.getBizOrgName()+ "@" +m.getSequenceNbr();
+					userNameList.add(userNameString);
+				});
+				detailMap.put("userName", userNameList);
+			}
 
-			personList.stream().forEach(m -> {
-				String userNameString =m.getBizOrgName()+ "@" +m.getSequenceNbr();
-				userNameList.add(userNameString);
-			});
-			detailMap.put("userName", userNameList);
-			OrgUsr companyDetail =	orgUsrServiceImpl.getDetailById(Long.parseLong(i));
-			String companyNameString = companyDetail.getBizOrgName()+ "@" +companyDetail.getSequenceNbr();
-			companyNameList.add(companyNameString);
+			//单位默认为 消防救援保障部，不可编辑。
 			detailMap.put("companyName", companyNameList);
+
 			List<DataDictionary>  dataDicList=	dataDictionaryService.getByType(typeString);
 			List<String> dataDicSimpleList = new ArrayList<String>();
 				dataDicList.stream().forEach(l->{