|
@@ -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("楼层顺序号不可以重复");
|
|
|
}
|
|
|
}
|