1

app/service/cloudEditionService.js

@@ -85,17 +85,19 @@ var cloudService={
         	
         });
     	
-        console.log(curingCloudList);
         
-        return '';
         //数据组合--cld客户数据
         var cid=[];
         curingCloudList.forEach(function(v,i){
-            cid.push(v.client_id);
+        	if(v.client_id!=0){
+        		cid.push(v.client_id);
+        	}
         });
-        var attributes= ['cid', 'clientname', 'companyid', 'companyname'];
-        var clientList = await models.CLD_client.findAllInCid(cid,attributes);
-
+        var clientList =[];
+        if(hash.isExistence(cid)){
+        	 var attributes= ['cid', 'clientname', 'companyid', 'companyname'];
+             clientList = await models.CLD_client.findAllInCid(cid,attributes);
+        }
         
         //组合页面需要展示的数据
         curingCloudList.forEach(function(v,i){
@@ -114,7 +116,11 @@ var cloudService={
         
         var parameter='?compilation_id='+compilation_id;
         //分页计算
-        var pageData = await getPage('','',page,limit,parameter,50);
+        var pageData = await getPage('','',page,limit,parameter,curingCloudData.pageData.total);
+        
+console.log(curingCloudList);
+        
+        
         
         return {curingList:curingCloudList,pageData:pageData};
         
@@ -124,7 +130,7 @@ var cloudService={
         
     	
     	//获得本地用户
-    	var limit=12;
+    	/*var limit=12;
         var offset=0;
         if(page!=1){
             var pg=page-1;
@@ -170,7 +176,7 @@ var cloudService={
         });
         //curingList['pageData']=pageData;
 
-        return {curingList:curingList,pageData:pageData};
+        return {curingList:curingList,pageData:pageData};*/
     },
 
     //获得本地编办列表