소스 이상 충돌 정리
This commit is contained in:
parent
0f84dc08fd
commit
4b44dc0acf
@ -194,7 +194,8 @@ public class NlibSearchServiceImpl implements NlibSearchService{
|
||||
{
|
||||
//주제분야 , 자료유형 ,생산기관 별 카운트
|
||||
tmpList = (JsonArray) tmp.get("CategoryGroup");
|
||||
|
||||
if(tmpList != null)
|
||||
{
|
||||
for( k=0; k < tmpList.size(); k++){
|
||||
filterObject = (JsonObject) tmpList.get(k);
|
||||
|
||||
@ -267,11 +268,14 @@ public class NlibSearchServiceImpl implements NlibSearchService{
|
||||
orgMap.add(temp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
tmp = (JsonObject) tmp.get("DocumentSet");
|
||||
searchVO.setTotalCount(tmp.get("TotalCount").getAsString());
|
||||
colArray = (JsonArray) tmp.get("Document");
|
||||
|
||||
if(colArray != null)
|
||||
{
|
||||
//vo list로 json list 파싱
|
||||
for(j=0;j<colArray.size();j++){
|
||||
tmp = (JsonObject)colArray.get(j);
|
||||
@ -288,6 +292,7 @@ public class NlibSearchServiceImpl implements NlibSearchService{
|
||||
vo.setMasterId(tmp.get); = gson.fromJson(tmp, NlibSearchCollectionVO.class);*/
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
searchVO.setResultList(list);
|
||||
searchVO.setSubjectCountList(subjectMap);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user