Merge branch 'cc_20240603_wantarea_bigregion' into 'master'

license

See merge request hangzhou/java/custom_xfsg!9
This commit is contained in:
zhangchenbiao
2024-06-05 07:11:58 +00:00

View File

@@ -105,7 +105,9 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
//防止一直在页面提交 //防止一直在页面提交
if (licenseTransactDO.getId() == null) { if (licenseTransactDO.getId() == null) {
LicenseTransactDO license = applyLicenseMapper.selectByShopId(request.getShopId()); LicenseTransactDO license = applyLicenseMapper.selectByShopId(request.getShopId());
licenseTransactDO.setId(license.getId()); if (license != null) {
licenseTransactDO.setId(license.getId());
}
} }
if (request.getId() == null) { if (request.getId() == null) {
applyLicenseMapper.insertSelective(licenseTransactDO); applyLicenseMapper.insertSelective(licenseTransactDO);