Commit 5eb7c9a6 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.6.4' into MVP1.6.4

parents 9ade7484 13441935
...@@ -362,6 +362,12 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI ...@@ -362,6 +362,12 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI
} }
//如果是基础配置 重置之前的配置 //如果是基础配置 重置之前的配置
updateType(tSocialDeadlineInfo); updateType(tSocialDeadlineInfo);
if (Common.isEmpty(tSocialDeadlineInfo.getCity())){
tSocialDeadlineInfo.setCity(null);
}
if (Common.isEmpty(tSocialDeadlineInfo.getTown())){
tSocialDeadlineInfo.setTown(null);
}
if (baseMapper.updateById(tSocialDeadlineInfo)>=0){ if (baseMapper.updateById(tSocialDeadlineInfo)>=0){
return R.ok(); return R.ok();
} }
...@@ -415,6 +421,12 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI ...@@ -415,6 +421,12 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI
} }
//如果是基础配置 重置之前的配置 //如果是基础配置 重置之前的配置
updateType(tSocialDeadlineInfo); updateType(tSocialDeadlineInfo);
if (Common.isEmpty(tSocialDeadlineInfo.getCity())){
tSocialDeadlineInfo.setCity(null);
}
if (Common.isEmpty(tSocialDeadlineInfo.getTown())){
tSocialDeadlineInfo.setTown(null);
}
if (baseMapper.insert(tSocialDeadlineInfo) >= 0){ if (baseMapper.insert(tSocialDeadlineInfo) >= 0){
return R.ok(); return R.ok();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment