Merge remote-tracking branch 'origin/master'

app/service/claimneed.js

@@ -425,7 +425,7 @@ class ClaimNeedService extends CrudService {
           as: 'dictnew' } },
           { $unwind: '$dictnew' },
          { $project: { jg_pro_id: {$toObjectId: '$jg_pro_id'},money:1,use:1,mongey_min_rate:1,mongey_max_rate:1,claims_min_term:1,claims_max_term:1,project_status:1,remarks:1,
-                      hyname:'$dictnew.name',cdata:1} },
+                      hyname:'$dictnew.name',cdata:1,finuserid:'$userid',userid:{$toObjectId: '$userid'}} },
          { $lookup: {
            from: 't_finance_claims',
            localField: 'jg_pro_id',
@@ -433,7 +433,19 @@ class ClaimNeedService extends CrudService {
            as: 'jgpronew' } },
         { $unwind: '$jgpronew' },
         { $project: { jg_pro_id:1,money:1,use:1,mongey_min_rate:1,mongey_max_rate:1,claims_min_term:1,claims_max_term:1,project_status:1,remarks:1,
-          hyname:1,cdata:1,folid:{$toString:'$_id'},jgpronew:1}},
+          hyname:1,cdata:1,folid:{$toString:'$_id'},jgpronew:1,finuserid:1,userid:1}},
+          { $lookup: {
+           from: 'company_user',
+           localField: 'userid',
+           foreignField: '_id',
+           as: 'cusernew' } },
+        { $unwind: { path: '$cusernew', preserveNullAndEmptyArrays: true } },
+        { $lookup: {
+           from: 'company_identify',
+           localField: 'finuserid',
+           foreignField: 'uid',
+           as: 'cotifynew' } },
+        { $unwind: { path: '$cotifynew', preserveNullAndEmptyArrays: true } },
         { $lookup: {
         from: 't_finance_follow',
         localField: 'folid',
@@ -441,7 +453,9 @@ class ClaimNeedService extends CrudService {
         as: 'follownew' } },
         { $unwind: { path: '$follownew', preserveNullAndEmptyArrays: true } },
         { $project: { jg_pro_id:1,money:1,use:1,mongey_min_rate:1,mongey_max_rate:1,claims_min_term:1,claims_max_term:1,project_status:1,remarks:1,
-                  hyname:1,cdata:1,folid:{$toString:'$_id'},jgpronew:1,sxcplilue:'$follownew.sxcplilue',sxcpname:'$follownew.sxcpname',sxhowlong:'$follownew.sxhowlong',credit_money:'$follownew.credit_money'}}
+                  hyname:1,cdata:1,folid:{$toString:'$_id'},jgpronew:1,sxcplilue:'$follownew.sxcplilue',
+                  sxcpname:'$follownew.sxcpname',sxhowlong:'$follownew.sxhowlong',credit_money:'$follownew.credit_money',
+                  finuserid:1,userphone:'$cusernew.phone',usernnmae:'$cusernew.person',cotifynew:1}}
       ]);
       return resmore;
     }

app/service/financefollow.js

@@ -57,9 +57,10 @@ class FinanceFollowService extends CrudService {
       }
     if(data.finalorc){
       match.orcredit = data.finalorc;
-    }else{
-      match.orcredit={ $ne: '1' };
     }
+    // else{
+    //   match.orcredit={ $ne: '1' };
+    // }
     const skip = Number.parseInt(data.skip) || 1;
     const limit = Number.parseInt(data.limit) || 10;
     const total = await this.model.count(match);