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 f565d9254..e9193fa92 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,7 +256,7 @@ public class ShopInfoServiceImpl extends ServiceImpl i String shopType = shopInfo.getShopType(); Long mainId = shopInfo.getMainId(); Integer isHeadShop = shopInfo.getIsHeadShop(); - if (shopType.equals(shopInfoEditDTO.getShopType())) { + if (StrUtil.isEmpty(shopInfoEditDTO.getShopType()) || shopType.equals(shopInfoEditDTO.getShopType())) { // 原来是单店,现在不是单店,那么就允许修改,否则不允许修改 } else if (ShopTypeEnum.ONLY.getValue().equals(shopType) && !ShopTypeEnum.ONLY.getValue().equals(shopInfoEditDTO.getShopType())) { if (shopInfoEditDTO.getIsHeadShop() == null) {