Browse Source

Merge remote-tracking branch 'origin/develop' into develop

lijie 3 years ago
parent
commit
318087f1d7

+ 1 - 1
src/main/java/com/persagy/proxy/object/controller/AdmFloorController.java

@@ -195,7 +195,7 @@ public class AdmFloorController {
                     if(admFloorBdMap.containsKey(admFloorOld.getBuildingId())){
                         AdmFloor admFloorNew = admFloorBdMap.get(admFloorOld.getBuildingId());
                         //楼层序列号相同
-                        if(!admFloorOld.getId().equals(admFloorNew.getId()) && admFloorOld.getFloorSequenceID()!=null && admFloorNew.getFloorSequenceID().equals(admFloorOld.getFloorSequenceID())){
+                        if(admFloorOld.getFloorSequenceID()!=null && admFloorNew.getFloorSequenceID()!= null && !admFloorOld.getId().equals(admFloorNew.getId()) && admFloorNew.getFloorSequenceID().equals(admFloorOld.getFloorSequenceID())){
                             return AdmResponse.failure("楼层顺序号不可以重复");
                         }
                     }