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

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -750,4 +750,27 @@ public class OrgUsrController extends BaseController {
         }
         return ResponseHelper.buildResponse(iOrgUsrService.getCompanyByBizOrgCodeList(bizOrgCode));
     }
+    
+    
+    /**
+     * 查询多个组织机构下面的所有人员列表信息
+     *
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查询当前人员所属的第一级公司", notes = "查询当前人员所属的第一级公司")
+    @GetMapping(value = "find/getCompanyByUserId")
+    public ResponseModel<Object> getCompanyByUserId(@RequestParam Long userId) {
+        return ResponseHelper.buildResponse(iOrgUsrService.getCompanyByUserId(userId));
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
 }
\ No newline at end of file

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

@@ -746,9 +746,11 @@ public class ExcelServiceImpl {
 			if (firefighters.getCompanyName() != null) {
 				String[] tempCompany = firefighters.getCompanyName().split("@");
 				firefighters.setCompanyName(tempCompany[0]);
+				firefighters.setCompanyCode(tempCompany[1]);
 				firefighters.setCompany(tempCompany[1]);
+				OrgUsr result = orgUsrService.getById(Long.valueOf(tempCompany[1]));
 				firefighters.setBizOrgName(tempCompany[0]);
-				firefighters.setBizOrgCode(tempCompany[2]);
+				firefighters.setBizOrgCode(result.getBizOrgCode());
 			}
 			if (firefighters.getNativePlaceValue() != null) {
 				String[] tempCity = firefighters.getNativePlaceValue().split("@");