Merge branch 'bpo-web' of http://gitlab.gongsibao.com/jiangyong/zhichan into bpo-web

bpo-web/app/base/api/impl/econtractApi.js

@@ -358,17 +358,25 @@ class EcontractApi {
                 msg: "签名失败"
                 msg: "签名失败"
             };
             };
         }
         }
+        let idNos = await this.usereaccountSve.idNoByUserId3rd(userId);
+
         var params = {
         var params = {
             ecompanyId: busi.ecompany_id,
             ecompanyId: busi.ecompany_id,
             startId: startId,
             startId: startId,
             idNo: idNo.toUpperCase(),
             idNo: idNo.toUpperCase(),
             pageSize: pageSize,
             pageSize: pageSize,
-            userId3rd: userId,
         };
         };
+        if (idNos && idNos.length > 0) {
+            params.idNos = idNos;
+        }
 
 
         try {
         try {
-            var userList = await this.econtractSve.findSignedUses4Push(params);
-
+            let userList = await this.econtractSve.findSignedUses4Push(params);
+            if (userId && userList && userList.length > 0) {
+                for (let u of userList) {
+                    u.userId3rd = userId;
+                }
+            }
             var result = {
             var result = {
                 code: 0,
                 code: 0,
                 msg: "success",
                 msg: "success",

bpo-web/app/base/controller/impl/userCtl.js

@@ -917,8 +917,11 @@ class UserCtl extends CtlBase {
       }
       }
     }
     }
 
 
-    var domain = "http://bpohhr.gongsibao.com";
+    var domain = "https://bpohhr.gongsibao.com";
     var arr = [];
     var arr = [];
+    if(ecid == 10460 || ecid == 10288) {
+      return domain + "/errpage?errmsg=" + encodeURIComponent(encodeURIComponent("链接已失效"));
+    }
     if (!appId) {
     if (!appId) {
       return domain + "/errpage?errmsg=" + encodeURIComponent(encodeURIComponent("未配置appId"));
       return domain + "/errpage?errmsg=" + encodeURIComponent(encodeURIComponent("未配置appId"));
     }
     }

bpo-web/app/base/service/impl/econtractSve.js

@@ -902,6 +902,9 @@ class EcontractService extends ServiceBase {
         if (params.idNo) {
         if (params.idNo) {
             sql.push("AND t2.`personsSign` = :idNo");
             sql.push("AND t2.`personsSign` = :idNo");
         }
         }
+        if (params.idNos) {
+            sql.push("AND t2.`personsSign` IN (:idNos)");
+        }
         if (params.userId3rd) {
         if (params.userId3rd) {
             sql.push("AND t3.`userId3rd` = :userId3rd");
             sql.push("AND t3.`userId3rd` = :userId3rd");
         }
         }

bpo-web/app/base/service/impl/usereaccountSve.js

@@ -160,6 +160,20 @@ class UsereaccountService extends ServiceBase{
     });
     });
     return list || [];
     return list || [];
   }
   }
+
+  async idNoByUserId3rd(userId3rd) {
+    if (!userId3rd) {
+      return;
+    }
+    let sql = "SELECT t1.`personsSign` FROM p_user_eaccount t1 INNER JOIN p_user t2 ON t1.`user_id` = t2.`id` WHERE t2.`userId3rd` = :userId3rd";
+    let list = await this.dao.customQuery(sql, {userId3rd: userId3rd,});
+    let rs = [];
+    for(let item of list) {
+      rs.push(item.personsSign);
+    }
+    return rs;
+  }
+
   async getSignAccounts_dk(etemplateIds, idNoList, idNameList) {
   async getSignAccounts_dk(etemplateIds, idNoList, idNameList) {
     var sql = [];
     var sql = [];