blade-service/estate/src/main/java/org/springblade/estate/controller/CarController.java

@@ -63,6 +63,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 
@@ -165,8 +166,6 @@ public class CarController extends BladeController {
 			car.setOrgPosition(residential.getOrgPosition());
 			car.setTenantId(residential.getTenantId());
 			car.setAgencyId(residential.getAgencyId());
-
-
 		} else {
 			Assert.notNull(car.getAgencyId(), "车所属园区/园区必选");
 			Agency search = new Agency();
@@ -177,29 +176,29 @@ public class CarController extends BladeController {
 			car.setTenantId(agency.getTenantId());
 
 		}
-//		Assert.notNull(car.getPersonId(),"车主id不能为空");
 		TenantType search = new TenantType();
 		search.setTenantId(car.getTenantId());
 		TenantTypeVO tenantTypeVO = tenantTypeClient.detail(search);
 		tenantType = tenantTypeVO.getTenantType();
-		if(tenantType == 1){//园区的车主为企业员工
-			if (car.getPersonId()!=null){
-				Staff searchEs = new Staff();
-				searchEs.setId(car.getPersonId());
-				Staff enterpriseStaff = staffClient.detail(searchEs);
-				Assert.notNull(enterpriseStaff,"找不到该员工");
-				car.setPersonName(enterpriseStaff.getRealName());
-				car.setPersonPhone(enterpriseStaff.getPhone());
-				car.setEnterpriseId(enterpriseStaff.getEnterpriseId());
-			}
-		}else{//园区的车主为住户
-			if (car.getPersonId()!=null){
-				HouseUser searchHU = new HouseUser();
-				searchHU.setId(car.getPersonId());
-				HouseUserVO houseUserVO = houseUserClient.detail(searchHU);
-				car.setPersonName(houseUserVO.getName());
-				car.setPersonPhone(houseUserVO.getPhone());
-			}
+		//园区
+		if(tenantType == 1 && car.getPersonId()!=null){
+			Staff searchEs = new Staff();
+			searchEs.setId(car.getPersonId());
+			Staff enterpriseStaff = staffClient.detail(searchEs);
+			Assert.notNull(enterpriseStaff,"找不到该员工");
+			car.setPersonName(enterpriseStaff.getRealName());
+			car.setPersonPhone(enterpriseStaff.getPhone());
+			car.setEnterpriseId(enterpriseStaff.getEnterpriseId());
+		}
+		//社区
+		if (tenantType == 0 && car.getPersonId()!=null){
+			HouseUser searchHU = new HouseUser();
+			searchHU.setId(car.getPersonId());
+			HouseUserVO houseUserVO = houseUserClient.detail(searchHU);
+			String name = Optional.ofNullable(houseUserVO).map(HouseUser::getName).orElse("");
+			car.setPersonName(name);
+			String phone = Optional.ofNullable(houseUserVO).map(HouseUser::getPhone).orElse("");
+			car.setPersonPhone(phone);
 		}
 		return R.status(carService.saveOrUpdate(car));
 	}