巡检模块代码物理合并3

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

@@ -1515,13 +1515,13 @@ public class PointController extends AbstractBaseController {
 			return CommonResponseUtil.failure("责任人不能为空");
 		}
 		if (!ObjectUtils.isEmpty(pointNewVo.getName())) {
-			List<Point> list = iPointDao.findByName(pointNewVo.getName());
+			List<Point> list = iPointDao.findByName(pointNewVo.getName(), pointNewVo.getId() != 0 ? String.valueOf(pointNewVo.getId()) : null);
 			if (CollectionUtils.isNotEmpty(list)) {
 				throw new BadRequest("该名称巡检点已存在");
 			}
 		}
 		if (!ObjectUtils.isEmpty(pointNewVo.getName())) {
-			List<Point> list = iPointDao.findByNo(pointNewVo.getPointNo());
+			List<Point> list = iPointDao.findByNo(pointNewVo.getPointNo(), pointNewVo.getId() != 0 ? String.valueOf(pointNewVo.getId()) : null);
 			if (CollectionUtils.isNotEmpty(list)) {
 				throw new BadRequest("该编号已存在");
 			}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/IPointDao.java

@@ -27,10 +27,10 @@ public interface IPointDao extends BaseDao<Point, Long> {
     
     Optional<Point> findById(Long id);
 
-    @Query(value = "select * from p_point where point_no = (?1) and is_delete =0", nativeQuery = true)
-    List<Point> findByNo(String pointNo);
+    @Query(value = "select * from p_point where point_no = (?1) and is_delete =0 and if(?2 is null, 1 = 1 , id = ?2)", nativeQuery = true)
+    List<Point> findByNo(String pointNo, String id);
 
-    @Query(value = "select * from p_point where name = (?1) and is_delete =0", nativeQuery = true)
-    List<Point> findByName(String name);
+    @Query(value = "select * from p_point where name = (?1) and is_delete =0 and if(?2 is null, 1 = 1 , id = ?2)", nativeQuery = true)
+    List<Point> findByName(String name, String id);
 
 }