feature-wzb:bug修复

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

@@ -171,10 +171,12 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
 							data.setErrorFlag(true);
 							errorMessage.append("所在地、最低工资(元)、状态为空;");
 						}
-						if (data.getLocation().contains("-")) {
-							data.setErrorFlag(true);
-							errorMessage.append("所在地格式与列表保持一致;");
-						} else {
+						if(null!=data.getLocation()) {
+							if (data.getLocation().contains("-")) {
+								data.setErrorFlag(true);
+								errorMessage.append("所在地格式与列表保持一致;");
+							}
+						}else {
 							if (null != data.getLocation()) {
 								String location[] = data.getLocation().split("/");
 								if (!data.getLocation().isEmpty()) {
@@ -223,10 +225,6 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
 								}
 								if (location.length > 2) {
 									String redisProvinceName = getRedisAreaValue(location[CommonConstants.ZERO_INT]);
-									if (Common.isEmpty(redisProvinceName)) {
-										data.setErrorFlag(true);
-										errorMessage.append("对应区域不存在;");
-									}
 									String redisCityName = getRedisAreaValue(location[CommonConstants.ONE_INT] + "_" + location[CommonConstants.ZERO_INT]);
 									if (Common.isEmpty(redisCityName)) {
 										data.setErrorFlag(true);
@@ -266,20 +264,19 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
 								}
 							}
 						}
-							if (null != data.getSalaryBase()) {
-								if (!ValidityUtil.validateStandard(data.getSalaryBase())) {
-									data.setErrorFlag(true);
-									errorMessage.append("最低工资，请填写>0的两位小数;");
-								}
-							}
-							if (null != data.getStatus()) {
-								if (!(CommonConstants.START.equals(data.getStatus()) || CommonConstants.STOP.equals(data.getStatus()))) {
-									data.setErrorFlag(true);
-									errorMessage.append("填写的状态不是启用或停用");
-								}
-							}
 						}
-
+					if (null != data.getSalaryBase()) {
+						if (!ValidityUtil.validateStandard(data.getSalaryBase())) {
+							data.setErrorFlag(true);
+							errorMessage.append("最低工资，请填写>0的两位小数;");
+						}
+					}
+					if (null != data.getStatus()) {
+						if (!(CommonConstants.START.equals(data.getStatus()) || CommonConstants.STOP.equals(data.getStatus()))) {
+							data.setErrorFlag(true);
+							errorMessage.append("填写的状态不是启用或停用");
+						}
+					}
 
 					if(data.isErrorFlag())
 
@@ -304,7 +301,6 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
 								TMinSalary selectOne = new TMinSalary();
 								selectOne.setId(e.getId());
 								if (null != e.getLocation()) {
-									if (e.getLocation().contains("/")) {
 										String location[] = e.getLocation().split("/");
 										if (location.length >1) {
 											for (int i = 0; i < location.length; i++) {
@@ -322,37 +318,29 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
 												}
 											}
 										}
-									}
-									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(null==e.getLocation()){
+								TMinSalary tMinSalary=baseMapper.selectById(e.getId());
+								    selectOne.setProvince(tMinSalary.getProvince());
+									selectOne.setCity(tMinSalary.getCity());
+									selectOne.setTown(tMinSalary.getTown());
+
 
-												}
-											}
-										}
-									}
 								}
-								if (CommonConstants.START.equals(e.getStatus())) {
-									selectOne.setStatus(CommonConstants.ONE_INT);
+								if(null!=e.getStatus()) {
+									if (CommonConstants.START.equals(e.getStatus())) {
+										selectOne.setStatus(CommonConstants.ONE_INT);
+									}
+									if (CommonConstants.STOP.equals(e.getStatus())) {
+										selectOne.setStatus(CommonConstants.TWO_INT);
+									}
 								}
-								if (CommonConstants.STOP.equals(e.getStatus())) {
-									selectOne.setStatus(CommonConstants.TWO_INT);
+								if(null!=e.getSalaryBase()) {
+									selectOne.setSalaryBase(e.getSalaryBase());
 								}
-								selectOne.setSalaryBase(e.getSalaryBase());
 								selectOne.setUpdateTime(LocalDateTime.now());
 								baseMapper.updateById(selectOne);
+
 							}
 					);
 				}