Merge branch 'develop_dl_plan6_temp' of…

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

@@ -1351,16 +1351,18 @@ public class PointController extends AbstractBaseController {
 			point.setOrgCode(loginOrgCode);	//点归属于公司
 			point.setCreatorId(user.getUserId());
 
+			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);
 
 			FeignClientResult userInfo = jcsFeignClient.selectById(point.getChargePersonId());
 			Object result = userInfo.getResult();
 			Map<String, Object> map = (Map<String, Object>) result;
-			String personName = map.get("personName").toString();
-			point.setChargePersonName(personName);
-			String bizOrgName = map.get("companyName").toString();
-			point.setChargePersonId(map.get("companyId").toString());
-			point.setBizOrgCode(map.get("bizOrgCode").toString());
-			point.setBizOrgName(bizOrgName);
+			point.setChargePersonName(map.get("personName").toString());
+
 			iPointService.addPointNew(point);
 			return CommonResponseUtil.success();
 		} catch (Exception e) {