Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/road/RoadInformationServiceImpl.java

@@ -127,7 +127,13 @@ public class RoadInformationServiceImpl extends BaseServiceImpl<RoadInformationM
             entity.setTenantId(CurrentUserUtil.getTenantId());
         } else {
             //更新
-            if (this.getInformationListByCode(entity)) return JsonResult.error("公路已存在");
+            RoadInformation roadInformation = this.getOne(Wrappers.<RoadInformation>lambdaQuery().eq(RoadInformation::getId, entity.getId()));
+            String code = entity.getCode();
+            //当前公路的code是否重复判断
+            if(!code.equals(roadInformation.getCode())){
+                //code如果不存在则查询数据库中公路列表是否有重复的code
+                if (this.getInformationListByCode(entity)) return JsonResult.error("公路已存在");
+            }
             entity.setUpdateUser(userId);
             entity.setUpdateTime(DateUtils.now());
             entity.setTenantId(CurrentUserUtil.getTenantId());