Fix服务商账号添加客户无法查询站点

VB_DSM_V2.1/vbdsm-web/vbdsm-manage/src/main/java/cn/vbdsm/manage/service/impl/ProxyCompanyService.java

@@ -314,30 +314,31 @@ public class ProxyCompanyService implements IProxyCompanyService {
     @Override
     public List<OrgSiteVo> getSiteList(String local, long uid, long cid, int isRoot, int fromSite, long orgId) {
         List<OrgSiteVo> dataList = new ArrayList<OrgSiteVo>();
+        //查询全部机构
+        List<Site> siteList = new ArrayList<Site>();
         if (isRoot == 1) {
-            Site condition = new Site();
-            //查询全部机构
-            Page<Site> page = siteDao.selectAll(condition);
-
-            //查询中间表，机构与站点是否绑定
-            Map<Long, Long> osMap = new HashMap<Long, Long>();
-            List<OrgSite> orgSiteList = orgSiteDao.selectByOrgId(orgId);
-            for (OrgSite os : orgSiteList) {
-                osMap.put(os.getSiteId(), os.getOrgId());
-            }
-            List<Site> siteList = page.getRows();
-            for (Site site : siteList) {
-                Map<String, Object> map = new HashMap<String, Object>();
-                map.put("id", site.getId());
-                map.put("name", site.getName());
-                OrgSiteVo sitevo = new OrgSiteVo();
-                sitevo.setId(site.getId());
-                sitevo.setName(site.getName());
-                if (osMap.containsKey(site.getId())) {
-                    sitevo.setChecked(true);
-                }
-                dataList.add(sitevo);
+            siteList = siteDao.selectAll(new Site()).getRows();
+        } else {
+            Site site = siteDao.get(Long.parseLong(fromSite + ""));
+            siteList.add(site);
+        }
+        //查询中间表，机构与站点是否绑定
+        Map<Long, Long> osMap = new HashMap<Long, Long>();
+        List<OrgSite> orgSiteList = orgSiteDao.selectByOrgId(orgId);
+        for (OrgSite os : orgSiteList) {
+            osMap.put(os.getSiteId(), os.getOrgId());
+        }
+        for (Site site : siteList) {
+            Map<String, Object> map = new HashMap<String, Object>();
+            map.put("id", site.getId());
+            map.put("name", site.getName());
+            OrgSiteVo sitevo = new OrgSiteVo();
+            sitevo.setId(site.getId());
+            sitevo.setName(site.getName());
+            if (osMap.containsKey(site.getId())) {
+                sitevo.setChecked(true);
             }
+            dataList.add(sitevo);
         }
 
         return dataList;