合并分支 'develop_master_new' 到 'FOTON'
map空指针报错 查看合并请求 laws-foton-slrs/foton-slrs-system-rest!6
This commit is contained in:
@@ -32,6 +32,7 @@ import com.adc.da.utils.util.InitStandAttrUtil;
|
|||||||
import com.adc.da.utils.util.Utils;
|
import com.adc.da.utils.util.Utils;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
|
import org.apache.commons.lang3.ObjectUtils;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.elasticsearch.client.transport.TransportClient;
|
import org.elasticsearch.client.transport.TransportClient;
|
||||||
import org.json.JSONTokener;
|
import org.json.JSONTokener;
|
||||||
@@ -614,6 +615,9 @@ public class ResetSearchCenterServiceTemp {
|
|||||||
if (StringUtils.isNotBlank(fieldInfo)) {
|
if (StringUtils.isNotBlank(fieldInfo)) {
|
||||||
Map<String, Object> getAttrMap = sarStandAttrInfoEODao.selectStandFieldAndData(fieldInfo, row.getId());
|
Map<String, Object> getAttrMap = sarStandAttrInfoEODao.selectStandFieldAndData(fieldInfo, row.getId());
|
||||||
// if (CollectionUtil.isNotEmpty(getAttrMap)) {
|
// if (CollectionUtil.isNotEmpty(getAttrMap)) {
|
||||||
|
if (ObjectUtils.isEmpty(getAttrMap)){
|
||||||
|
getAttrMap = new HashMap<>();
|
||||||
|
}
|
||||||
if (InitStandAttrUtil.clobFieldList != null && !InitStandAttrUtil.clobFieldList.isEmpty()) {
|
if (InitStandAttrUtil.clobFieldList != null && !InitStandAttrUtil.clobFieldList.isEmpty()) {
|
||||||
// 遍历修改所有clob类型的值
|
// 遍历修改所有clob类型的值
|
||||||
for (String clobField : InitStandAttrUtil.clobFieldList) {
|
for (String clobField : InitStandAttrUtil.clobFieldList) {
|
||||||
|
|||||||
Reference in New Issue
Block a user