Commit 112bcc38e83f6343658db5e79f09506b765b8eae
1 parent
5cde1c03
修改判断
Showing
1 changed file
with
1 additions
and
1 deletions
etrade-shop/src/main/java/com/diligrp/etrade/shop/service/impl/ShopApproveServiceImpl.java
@@ -545,7 +545,7 @@ public class ShopApproveServiceImpl implements ShopApproveService { | @@ -545,7 +545,7 @@ public class ShopApproveServiceImpl implements ShopApproveService { | ||
545 | Shop shopOld = shopMapper.selectByPrimaryKey(newShopApprove.getShopId()); | 545 | Shop shopOld = shopMapper.selectByPrimaryKey(newShopApprove.getShopId()); |
546 | log.info("店铺修改直接更新店铺 shopOld={}", shopOld); | 546 | log.info("店铺修改直接更新店铺 shopOld={}", shopOld); |
547 | if (shopOld != null && | 547 | if (shopOld != null && |
548 | - newShopApprove.getCardNo() != null | 548 | + StringUtils.isNotBlank(newShopApprove.getCardNo()) |
549 | && !StrUtil.equals(newShopApprove.getCardNo(), shopOld.getCardNo())) { | 549 | && !StrUtil.equals(newShopApprove.getCardNo(), shopOld.getCardNo())) { |
550 | UserAccountSingleQueryDto cardQuery = new UserAccountSingleQueryDto(); | 550 | UserAccountSingleQueryDto cardQuery = new UserAccountSingleQueryDto(); |
551 | cardQuery.setFirmId(shopOld.getMarketId()); | 551 | cardQuery.setFirmId(shopOld.getMarketId()); |