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

@@ -23,6 +23,7 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.scheduling.annotation.Async;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -354,9 +355,13 @@ public class PointController extends AbstractBaseController {
 				PointClassify pointClassify=iPointClassifyDao.getOne(id);
 				List<PointClassify> list=iPointClassifyDao.getPointClassifyByPointId(pointClassify.getPointId());
 				List<RoutePointItem> listp=iRoutePointItemDao.getRoutePointItemByPointId(pointClassify.getPointId());
+
 				if(list.size()==1&&listp!=null&&listp.size()>0){
 					return CommonResponseUtil.failure("巡查点已绑定路线，最少保留一个巡查对象！");
 				}
+				if(list.size()==1){
+					return CommonResponseUtil.failure("巡查点最少保留一个巡查对象！");
+				}
 				//删除对象
 				iPointClassifyDao.deleteById(id);
 				//删除检查项