feature-wzb:bug修复

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TMinSalaryServiceImpl.java

@@ -398,35 +398,64 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
 						salaryImportsSuccessList.stream().forEach(e -> {
 							TMinSalary selectOne = new TMinSalary();
 							selectOne.setId(e.getId());
-
-							String location[] = e.getLocation().split("/");
-							if(location.length>1) {
-								for (int i = 0; i < location.length; i++) {
-									if (i == CommonConstants.ZERO_INT) {
-										int province = baseMapper.selectByAreaName(location[i]);
-										selectOne.setProvince(province);
-									}
-									if (i == CommonConstants.ONE_INT) {
-										int city = baseMapper.selectByAreaName(location[i]);
-										selectOne.setCity(city);
-									}
-									if (i == CommonConstants.TWO_INT) {
-										int town = baseMapper.selectByAreaName(location[i]);
-										selectOne.setTown(town);
-										;
+                            if (e.getLocation().contains("/")) {
+								String location[] = e.getLocation().split("/");
+								if (location.length > 1) {
+									for (int i = 0; i < location.length; i++) {
+										if (i == CommonConstants.ZERO_INT) {
+											int province = baseMapper.selectByAreaName(location[i]);
+											selectOne.setProvince(province);
+										}
+										if (i == CommonConstants.ONE_INT) {
+											int city = baseMapper.selectByAreaName(location[i]);
+											selectOne.setCity(city);
+										}
+										if (i == CommonConstants.TWO_INT) {
+											int town = baseMapper.selectByAreaName(location[i]);
+											selectOne.setTown(town);
+											;
+										}
 									}
 								}
+								if (CommonConstants.START.equals(e.getStatus())) {
+									selectOne.setStatus(CommonConstants.ONE_INT);
+								}
+								if (CommonConstants.STOP.equals(e.getStatus())) {
+									selectOne.setStatus(CommonConstants.TWO_INT);
+								}
+								selectOne.setSalaryBase(e.getSalaryBase());
+								selectOne.setUpdateTime(LocalDateTime.now());
+								baseMapper.updateById(selectOne);
 							}
-							if (CommonConstants.START.equals(e.getStatus())) {
-								selectOne.setStatus(CommonConstants.ONE_INT);
-							}
-							if (CommonConstants.STOP.equals(e.getStatus())) {
-								selectOne.setStatus(CommonConstants.TWO_INT);
+							if (e.getLocation().contains("-")) {
+								String location[] = e.getLocation().split("-");
+								if (location.length > 1) {
+									for (int i = 0; i < location.length; i++) {
+										if (i == CommonConstants.ZERO_INT) {
+											int province = baseMapper.selectByAreaName(location[i]);
+											selectOne.setProvince(province);
+										}
+										if (i == CommonConstants.ONE_INT) {
+											int city = baseMapper.selectByAreaName(location[i]);
+											selectOne.setCity(city);
+										}
+										if (i == CommonConstants.TWO_INT) {
+											int town = baseMapper.selectByAreaName(location[i]);
+											selectOne.setTown(town);
+											;
+										}
+									}
+								}
+								if (CommonConstants.START.equals(e.getStatus())) {
+									selectOne.setStatus(CommonConstants.ONE_INT);
+								}
+								if (CommonConstants.STOP.equals(e.getStatus())) {
+									selectOne.setStatus(CommonConstants.TWO_INT);
+								}
+								selectOne.setSalaryBase(e.getSalaryBase());
+								selectOne.setUpdateTime(LocalDateTime.now());
+								baseMapper.updateById(selectOne);
 							}
-							selectOne.setSalaryBase(e.getSalaryBase());
-							selectOne.setUpdateTime(LocalDateTime.now());
-							baseMapper.updateById(selectOne);
-
 						});
 					}
 				}