修改代码

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

@@ -2643,7 +2643,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 				if(bizOrg.getBizOrgType().equals("COMPANY")){
 					userDto.setCompanyBizOrgCode(bizOrg.getBizOrgCode());
 				}else{
-					userDto.setCompanyBizOrgCode(getCompany(userDto));
+					userDto.setCompanyBizOrgCode(getCompany(bizOrg));
 				}
 
 			} else {
@@ -2666,12 +2666,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 
-	public String getCompany(UserDto userDto ){
-		if(userDto.getBizOrgType().equals("COMPANY")){
-
-			return userDto.getBizOrgCode();
+	public String getCompany(OrgUsr orgUsr ){
+		if(orgUsr.getBizOrgType().equals("COMPANY")){
+			return orgUsr.getBizOrgCode();
 		}else{
-			return getCompany(userDto);
+			OrgUsr bizOrg = orgUsrMapper.queryBySequenceNbr(orgUsr.getParentId());
+			return getCompany(bizOrg);
 		}
 	}
 
@@ -3249,8 +3249,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		QueryWrapper<OrgUsr> wrapper = new QueryWrapper<>();
 		wrapper.eq("is_delete",false);
 		wrapper.eq("biz_org_code",bizOrgCode);
-		wrapper.eq("biz_org_type","PERSON");
-		return 	baseMapper.selectList(wrapper);
+		wrapper.notIn("biz_org_type","PERSON");
+		OrgUsr orgUsr = baseMapper.selectOne(wrapper);
+
+		LambdaQueryWrapper<OrgUsr> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(BaseEntity::getIsDelete,false);
+		queryWrapper.eq(OrgUsr::getParentId,orgUsr.getSequenceNbr());
+		queryWrapper.eq(OrgUsr::getBizOrgType,"PERSON");
+		return	baseMapper.selectList(queryWrapper);
 	}
 
 	public List<OrgUsr> getDetByCompanyId(String companyId){

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

@@ -5,6 +5,7 @@ import java.util.*;
 import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.patrol.business.dao.repository.IPointClassifyDao;
 import com.yeejoin.amos.patrol.business.dao.repository.IPointInputItemDao;
@@ -1348,15 +1349,13 @@ public class PointController extends AbstractBaseController {
 			point.setCreatorId(user.getUserId());
 
 
-			ResponseModel<Object> companyInfo = jcsFeignClient.getCompanyInfo(point.getChargeDeptId());
 			FeignClientResult userInfo = jcsFeignClient.selectById(point.getChargePersonId());
 			Object result = userInfo.getResult();
-			String personName = ((Map<String, Object>) result).get("personName").toString();
+			Map<String, Object> map = (Map<String, Object>) result;
+			String personName = map.get("personName").toString();
 			point.setChargePersonName(personName);
-			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);
+			String bizOrgName = map.get("companyName").toString();
+			point.setChargePersonId(map.get("companyId").toString());
 			point.setBizOrgName(bizOrgName);
 			iPointService.addPointNew(point);
 			return CommonResponseUtil.success();

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

@@ -147,7 +147,7 @@ public class RouteController extends AbstractBaseController {
 				//查询jcs
 				FeignClientResult result = jcsFeignClient.selectById(route.getBoss());
 				Object obj = result.getResult();
-				String bizOrgName = ((Map<String, Object>) obj).get("bizOrgName").toString();
+				String bizOrgName = ((Map<String, Object>) obj).get("personName").toString();
 				route.setBossName(bizOrgName);
 			}
 			route.setCreatorId(getUserId());