diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java index 1f84b9ad..f565d925 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java @@ -256,8 +256,9 @@ public class ShopInfoServiceImpl extends ServiceImpl i String shopType = shopInfo.getShopType(); Long mainId = shopInfo.getMainId(); Integer isHeadShop = shopInfo.getIsHeadShop(); - // 原来是单店,现在不是单店,那么就允许修改,否则不允许修改 - if (ShopTypeEnum.ONLY.equals(shopType) && !ShopTypeEnum.ONLY.getValue().equals(shopInfoEditDTO.getShopType())) { + if (shopType.equals(shopInfoEditDTO.getShopType())) { + // 原来是单店,现在不是单店,那么就允许修改,否则不允许修改 + } else if (ShopTypeEnum.ONLY.getValue().equals(shopType) && !ShopTypeEnum.ONLY.getValue().equals(shopInfoEditDTO.getShopType())) { if (shopInfoEditDTO.getIsHeadShop() == null) { throw new CzgException("加盟店/连锁店请选择是否主店"); }