修改车辆编辑默认取装备定义的名字

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarController.java

@@ -365,10 +365,10 @@ public class CarController extends AbstractBaseController {
         if (!ObjectUtils.isEmpty(car.getTeamId())){
             jcsFeign.getUserCar(car.getId(),car.getTeamId());
         }
-        if (ObjectUtils.isEmpty(car.getName())) {
-            Equipment equipment = iEquipmentService.getById(car.getEquipmentId());
-            car.setName(equipment != null ? equipment.getName() : null);
-        }
+
+        Equipment equipment = iEquipmentService.getById(car.getEquipmentId());
+        car.setName(equipment != null ? equipment.getName() : null);
+        
         if (ObjectUtils.isEmpty(car.getBizOrgName()) && !ObjectUtils.isEmpty(car.getBizOrgCode())) {
             FeignClientResult<Map<String, Object>> result = Privilege.companyClient.queryByOrgcode(car.getBizOrgCode());
             System.out.println("==============================" + JSONObject.toJSONString(result.getResult()));