Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -563,7 +563,8 @@ GROUP BY
 
     SELECT
         company_sur.sequence_nbr as sequenceNbr,
-        company_sur.biz_org_name as bizOrgName ,
+        company_sur.biz_org_name as bizOrgName,
+        company_sur.biz_org_code as bizOrgCode,
         company_sur.parent_id as parentId,
         company_sur.biz_org_type as bizOrgType,
 --         cb.field_value_label,
@@ -580,6 +581,7 @@ GROUP BY
                 company.sequence_nbr,
                 company.parent_id,
                 company.biz_org_name,
+                company.biz_org_code,
                 company.biz_org_type
             FROM
                 cb_org_usr company

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

@@ -153,6 +153,9 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
 			List<Map<String, Object>>	resultList = new ArrayList<Map<String, Object>>();
 			LinkedHashMap<String, Object> titleMap_1 =new LinkedHashMap<String, Object>();
 			titleMap_1.put("消防车辆", map.get("carName").toString());
+			if(map.containsKey("carName") && map.get("carName") != null){
+				titleMap_1.put("消防车辆", map.get("carName").toString());
+			}
 			resultList.add(titleMap_1);
 			LinkedHashMap<String, Object> titleMap_2 =new LinkedHashMap<String, Object>();
 			//titleMap_2.put("单位/部门", map.get("teamName").toString());

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

@@ -1469,7 +1469,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
                     int num = orgUsrTreeDto.getNum() + value.getNum();
                     orgUsrTreeDto.setNum(num);
                 } else {
-                    if (value.getBizOrgType().equals(OrgPersonEnum.公司.getKey()) && null == value.getParentId()) {
+                    // 只查出一级单位，顶级为西部机场集团
+                    if (value.getBizOrgType().equals(OrgPersonEnum.公司.getKey()) && value.getBizOrgCode().length() == TreeParser.CODE_LENGTH * 2) {
                         list.add(value);
                     }
                 }