diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/AppProjectFeignClient.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/AppProjectFeignClient.java
index 8ac288f..127a1bf 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/AppProjectFeignClient.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/AppProjectFeignClient.java
@@ -6,6 +6,7 @@ import com.njcn.csdevice.api.fallback.AppProjectClientFallbackFactory;
 import com.njcn.csdevice.pojo.param.AppProjectAddParm;
 import com.njcn.csdevice.pojo.po.AppProjectPO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -25,7 +26,7 @@ public interface AppProjectFeignClient {
     @PostMapping("/getProjectByName")
     HttpResult<AppProjectPO> getProjectByName(@RequestParam("name") String name);
 
-    @PostMapping("/addAppProject")
-    HttpResult<AppProjectPO> addAppProject(@RequestBody AppProjectAddParm appProjectAddParm);
+    @PostMapping("/addPortableProject")
+    HttpResult<AppProjectPO> addPortableProject(@Validated @RequestBody AppProjectAddParm appProjectAddParm);
 
 }
diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/AppProjectClientFallbackFactory.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/AppProjectClientFallbackFactory.java
index 544133f..9739a4e 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/AppProjectClientFallbackFactory.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/AppProjectClientFallbackFactory.java
@@ -41,8 +41,8 @@ public class AppProjectClientFallbackFactory implements FallbackFactory<AppProje
             }
 
             @Override
-            public HttpResult<AppProjectPO> addAppProject(AppProjectAddParm appProjectAddParm) {
-                log.error("{}异常，降级处理，异常为：{}","新增项目异常",cause.toString());
+            public HttpResult<AppProjectPO> addPortableProject(AppProjectAddParm appProjectAddParm) {
+                log.error("{}异常，降级处理，异常为：{}","新增便携式项目",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
         };
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/AppProjectController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/AppProjectController.java
index 59036f8..58dde30 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/AppProjectController.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/AppProjectController.java
@@ -65,12 +65,21 @@ public class AppProjectController  extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/addAppProject")
     @ApiOperation("新增项目")
-    public HttpResult<AppProjectPO> addAppProject(@Validated @RequestBody AppProjectAddParm appProjectAddParm){
+    public HttpResult<AppProjectPO> addAppProject(@Validated AppProjectAddParm appProjectAddParm){
         String methodDescribe = getMethodDescribe("addAppProject");
-
         AppProjectPO po = appProjectService.addAppProject(appProjectAddParm);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
     }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/addPortableProject")
+    @ApiOperation("新增便携式项目")
+    public HttpResult<AppProjectPO> addPortableProject(@Validated @RequestBody AppProjectAddParm appProjectAddParm){
+        String methodDescribe = getMethodDescribe("addPortableProject");
+        AppProjectPO po = appProjectService.addAppProject(appProjectAddParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
+    }
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/auditAppProject")
     @ApiOperation("修改/删除项目")
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java
index 3fc52c6..345eaf1 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java
@@ -159,6 +159,8 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
                     vo.setOffLineDevCount(offlineDevs.size());
                     vo.setOffLineDevs(offlineDevs);
                 }
+            } else {
+                return vo;
             }
             //获取未读事件数量
             int eventCount = this.baseMapper.queryTempEvent(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),null);
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
index c4590c1..6c3aebb 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
@@ -221,8 +221,12 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
             return result;
         }
         BeanUtils.copyProperties (csEquipmentDeliveryPO,result);
-        result.setAssociatedEngineeringName(csLedgerService.findDataById(csEquipmentDeliveryPO.getAssociatedEngineering()).getName());
-        result.setAssociatedProjectName(csLedgerService.findDataById(csEquipmentDeliveryPO.getAssociatedProject()).getName());
+        if(!Objects.isNull (csEquipmentDeliveryPO.getAssociatedEngineering()) && !Objects.equals(csEquipmentDeliveryPO.getAssociatedEngineering(),"")) {
+            result.setAssociatedEngineeringName(csLedgerService.findDataById(csEquipmentDeliveryPO.getAssociatedEngineering()).getName());
+        }
+        if(!Objects.isNull (csEquipmentDeliveryPO.getAssociatedProject()) && !Objects.equals(csEquipmentDeliveryPO.getAssociatedProject(),"")) {
+            result.setAssociatedProjectName(csLedgerService.findDataById(csEquipmentDeliveryPO.getAssociatedProject()).getName());
+        }
         return result;
     }
 
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/EngineeringProjectServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/EngineeringProjectServiceImpl.java
index 4de65e9..db6b9da 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/EngineeringProjectServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/EngineeringProjectServiceImpl.java
@@ -183,7 +183,7 @@ public class EngineeringProjectServiceImpl implements IEngineeringProjectService
 
         //查询所有拓扑图
         LambdaQueryWrapper<AppTopologyDiagramPO> queryWrapper3 = new LambdaQueryWrapper<>();
-        queryWrapper3.eq(AppTopologyDiagramPO::getStatus,"1");
+        queryWrapper3.eq(AppTopologyDiagramPO::getStatus,1);
         List<AppTopologyDiagramPO> list3 = appTopologyDiagramService.list(queryWrapper3);
         Map<String,AppTopologyDiagramPO> map3 = list3.stream().collect(Collectors.toMap(AppTopologyDiagramPO::getProjectId, item->item));