Merge remote-tracking branch 'origin/develop_master' into develop_master
This commit is contained in:
+3
-1
@@ -127,7 +127,9 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
|
|||||||
boolean isForeign = false;
|
boolean isForeign = false;
|
||||||
Map<String,Object> fullTextSearchEO = new HashMap<>();
|
Map<String,Object> fullTextSearchEO = new HashMap<>();
|
||||||
Map<String,String> mapItems = new TreeMap<>();
|
Map<String,String> mapItems = new TreeMap<>();
|
||||||
mapItems = net.sf.json.JSONObject.fromObject(attrInfoMap.get("mapItems").toString());
|
if(attrInfoMap.get("mapItems") != null){
|
||||||
|
mapItems = net.sf.json.JSONObject.fromObject(attrInfoMap.get("mapItems").toString());
|
||||||
|
}
|
||||||
fullTextSearchEO.put("id",String.valueOf(attrInfoMap.get("id")));
|
fullTextSearchEO.put("id",String.valueOf(attrInfoMap.get("id")));
|
||||||
if ("FOREIGN".equals(String.valueOf(attrInfoMap.get("standType")))){
|
if ("FOREIGN".equals(String.valueOf(attrInfoMap.get("standType")))){
|
||||||
fullTextSearchEO.put("indexType",String.valueOf(attrInfoMap.get("standType")));
|
fullTextSearchEO.put("indexType",String.valueOf(attrInfoMap.get("standType")));
|
||||||
|
|||||||
Reference in New Issue
Block a user