2022年10月31 19:10

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescController.java

@@ -276,7 +276,6 @@ public class CorpsDescController extends BladeController {
 	@ApiOperationSupport(order = 12)
 	@ApiOperation(value = "导入客户资料", notes = "传入excel")
 	public R importUser(@RequestParam("file") MultipartFile file, @RequestParam("corpType") String corpType) {
-		redisClient.basicData("corps");
 		List<CorpsExcel> excelList = ExcelUtil.read(file, CorpsExcel.class);
 		if (CollectionUtils.isEmpty(excelList)) {
 			throw new SecurityException("数据不能为空");

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/impl/CorpsDescServiceImpl.java

@@ -292,7 +292,6 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 						corpsDesc.setCreateUser(AuthUtil.getUserId());
 						corpsDesc.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
 						baseMapper.insert(corpsDesc);
-
 						CorpsTypeDesc middle = new CorpsTypeDesc();
 						middle.setCorpId(corpsDesc.getId());
 						middle.setCorpTypeId(corpsType.getId());
@@ -300,24 +299,22 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 						middle.setCreateUser(AuthUtil.getUserId());
 						middle.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
 						middleMapper.insert(middle);
-
 						//绑定收货地址
-						String addressList = e.getAddressList();
-						String[] split = addressList.split("-");
-						List<String> list = Arrays.asList(split);
-						if (CollectionUtils.isNotEmpty(list)) {
-							list.forEach(lt -> {
-								CorpsAddr corpsAddr = new CorpsAddr();
-								corpsAddr.setPid(corpsDesc.getId());
-								corpsAddr.setAddr(lt);
-								corpsAddr.setCreateTime(new Date());
-								corpsAddr.setCreateUser(AuthUtil.getUserId());
-								corpsAddrMapper.insert(corpsAddr);
-							});
-
-
+						if (ObjectUtil.isNotEmpty(e.getAddressList())) {
+							String addressList = e.getAddressList();
+							String[] split = addressList.split("-");
+							List<String> list = Arrays.asList(split);
+							if (CollectionUtils.isNotEmpty(list)) {
+								list.forEach(lt -> {
+									CorpsAddr corpsAddr = new CorpsAddr();
+									corpsAddr.setPid(corpsDesc.getId());
+									corpsAddr.setAddr(lt);
+									corpsAddr.setCreateTime(new Date());
+									corpsAddr.setCreateUser(AuthUtil.getUserId());
+									corpsAddrMapper.insert(corpsAddr);
+								});
+							}
 						}
-
 					} else {
 						corpsDesc.setId(selectOne.getId());
 						corpsDesc.setUpdateTime(new Date());
@@ -337,7 +334,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 				throw new SecurityException("导入失败,请仔细检查导入数据");
 			}
 
-		} catch (Exception e) {
+		} catch (Exception exception) {
 			throw new SecurityException("请检查导入数据");
 		}
 	}

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -232,8 +232,8 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 
 
 	@Override
-	@Transactional
-	@GlobalTransactional
+	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public Settlement modify(SettlementDTO settlementDTO) {
 		Long id = settlementDTO.getId();
 		Settlement settlement = baseMapper.selectById(id);