Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master
This commit is contained in:
+2
-1
@@ -48,6 +48,7 @@ import com.alibaba.fastjson.JSONObject;
|
|||||||
import com.alibaba.fastjson.serializer.SerializerFeature;
|
import com.alibaba.fastjson.serializer.SerializerFeature;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
|
import org.apache.commons.lang3.ObjectUtils;
|
||||||
import org.json.JSONTokener;
|
import org.json.JSONTokener;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@@ -168,7 +169,7 @@ public class ActSarItemsBussEOService {
|
|||||||
String releaseTime = String.valueOf(standMap.get("releaseTime"));
|
String releaseTime = String.valueOf(standMap.get("releaseTime"));
|
||||||
String YYBZ = String.valueOf(standMap.get("YYBZ"));
|
String YYBZ = String.valueOf(standMap.get("YYBZ"));
|
||||||
String CYBZ = String.valueOf(standMap.get("CYBZ"));
|
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 DTQBBHBUSS = String.valueOf(standMap.get("DTQBBHBUSS"));
|
||||||
String LXD = String.valueOf(standMap.get("LXD"));
|
String LXD = String.valueOf(standMap.get("LXD"));
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user