Merge remote-tracking branch 'origin/master' into cc_20240605_feat

2024-06-05 16:26:16 +08:00
parent 5a000a74f1 bf5024729d
commit 9790e7e354
1 changed files with 3 additions and 1 deletions
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
@@ -112,7 +112,9 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
        //防止一直在页面提交
        if (licenseTransactDO.getId() == null) {
            LicenseTransactDO license = applyLicenseMapper.selectByShopId(request.getShopId());
-            licenseTransactDO.setId(license.getId());
+            if (license != null) {
+                licenseTransactDO.setId(license.getId());
+            }
        }
        if (request.getId() == null) {
            applyLicenseMapper.insertSelective(licenseTransactDO);