Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master

This commit is contained in:
zhangyanduan
2022-10-21 09:47:15 +08:00
@@ -48,6 +48,7 @@ import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.json.JSONTokener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -168,7 +169,7 @@ public class ActSarItemsBussEOService {
String releaseTime = String.valueOf(standMap.get("releaseTime"));
String YYBZ = String.valueOf(standMap.get("YYBZ"));
String CYBZ = String.valueOf(standMap.get("CYBZ"));
String SYCXCLASS = getFieldsValue(standMap,"SYCXCLASS");
String SYCXCLASS = ObjectUtils.isEmpty(standMap.get("SYCXCLASS")) ? "" : getFieldsValue(standMap, "SYCXCLASS");
String DTQBBHBUSS = String.valueOf(standMap.get("DTQBBHBUSS"));
String LXD = String.valueOf(standMap.get("LXD"));