修改巡检点新增

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

@@ -964,8 +964,7 @@ public class OrgUsrController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET", value = "查询单位基本信息", notes = "查询单位基本信息")
 	@GetMapping(value = "/getCompanyInfo")
-	public ResponseModel<OrgUsr> getCompanyInfo(String companyId) throws Exception {
-
+	public ResponseModel<Object> getCompanyInfo(@RequestParam String companyId) throws Exception {
 		return ResponseHelper.buildResponse(iOrgUsrService.getByIduser(companyId));
 	}
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java

@@ -1131,9 +1131,11 @@ public class PointController extends AbstractBaseController {
 			point.setOrgCode(loginOrgCode);	//点归属于公司
 			point.setCreatorId(user.getUserId());
 
-			Object result = jcsFeignClient.getCompanyInfo(point.getChargeDeptId()).getResult();
-			String bizOrgCode = ((Map<String, Object>) result).get("bizOrgCode").toString();
-			String bizOrgName = ((Map<String, Object>) result).get("bizOrgName").toString();
+
+			ResponseModel<Object> companyInfo = jcsFeignClient.getCompanyInfo(point.getChargeDeptId());
+			Object obj = companyInfo.getResult();
+			String bizOrgCode = ((Map<String, Object>) obj).get("bizOrgCode").toString();
+			String bizOrgName = ((Map<String, Object>) obj).get("bizOrgName").toString();
 			point.setBizOrgCode(bizOrgCode);
 			point.setBizOrgName(bizOrgName);
 			iPointService.addPointNew(point);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/feign/JcsFeignClient.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.patrol.business.feign;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -62,6 +63,6 @@ public interface JcsFeignClient {
     FeignClientResult<List<Map<String, Object>>> selectByIdList(@RequestBody List<String> id);
 
     @GetMapping(value = "/org-usr/getCompanyInfo")
-     ResponseModel<Object> getCompanyInfo(String companyId);
+     ResponseModel<Object> getCompanyInfo(@RequestParam(value = "companyId") String companyId);
 }