gsb

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

@@ -1721,67 +1721,37 @@ class EcontractApi {
                 idNameList.push(u.idName);
                 idNameList.push(u.idName);
             }
             }
 
 
-            // 2 查公司
-            // var companybpo = await this.ecompanybpoSve.findOne({
-            //     busi_id: mtchId
-            // });
-            // if (!companybpo) {
-            //     return {
-            //         code: 1,
-            //         msg: "电子签企业未录入当前商户ID"
-            //     };
-            // }
-
-            // if (!companybpo.mainId) {
-            //     return {
-            //         code: 1,
-            //         msg: "请更新电子签企业"
-            //     };
-            // }
-
-
             // 3 查签约模板(c_etemplate_busi)
             // 3 查签约模板(c_etemplate_busi)
             var templateIds = await this.etemplateSve.findIdsByCompanyIdAndMainId(mtchId);
             var templateIds = await this.etemplateSve.findIdsByCompanyIdAndMainId(mtchId);
-            if (templateIds.idsO.length == 0 && templateIds.idsT.length == 0) {
-                return {
-                    code: 1,
-                    msg: "电子签模板签约主体设置错误，请到bpo后台重新设置"
-                };
-            }
 
 
             var signList = [];
             var signList = [];
             var unSignList = [];
             var unSignList = [];
             var accountMap = {};
             var accountMap = {};
             var accountMap2 = {};
             var accountMap2 = {};
+            var accountMap3 = {};
             // 4 查签约用户
             // 4 查签约用户
             if (templateIds.idsO.length > 0) {
             if (templateIds.idsO.length > 0) {
                 var idsOCOunt = await this.usereaccountSve.getSignAccounts(templateIds.idsO, idNoList, idNameList);
                 var idsOCOunt = await this.usereaccountSve.getSignAccounts(templateIds.idsO, idNoList, idNameList);
                 for (var idO of idsOCOunt) {
                 for (var idO of idsOCOunt) {
                     accountMap[idO.userName + "_" + idO.personsSign] = 1;
                     accountMap[idO.userName + "_" + idO.personsSign] = 1;
                 }
                 }
-
-                var coids = await this.findecontractoffline(mtchId,idNoList,idNameList);
-                for (var id in coids){
-                    accountMap[id.id_name + "_" +id.id_no] = 1;
-                }
-
             }
             }
             if (templateIds.idsT.length > 0) {
             if (templateIds.idsT.length > 0) {
                 var idsTCount = await this.usereaccountSve.getSignAccounts_dk(templateIds.idsT, idNoList, idNameList);
                 var idsTCount = await this.usereaccountSve.getSignAccounts_dk(templateIds.idsT, idNoList, idNameList);
                 for (var idT of idsTCount) {
                 for (var idT of idsTCount) {
                     accountMap2[idT.userName + "_" + idT.personsSign] = 1;
                     accountMap2[idT.userName + "_" + idT.personsSign] = 1;
                 }
                 }
-                var coids = await this.findecontractoffline(mtchId,idNoList,idNameList);
-                for (var coid of coids){
-                    accountMap2[coid.id_name + "_" +coid.id_no] = 1;
             }
             }
 
 
+            //线下
+            var coids = await this.econtractofflineSve.findSignAccount(mtchId,idNoList,idNameList)
+            for (var coid of coids){
+                accountMap3[coid.id_name + "_" +coid.id_no] = 1;
             }
             }
 
 
-
             // 5 比对用户是否签约
             // 5 比对用户是否签约
             for (var u of userList) {
             for (var u of userList) {
-                if (accountMap[u.idName + "_" + u.idNo] || accountMap2[u.idName + "_" + u.idNo]) {
+                if (accountMap[u.idName + "_" + u.idNo] || accountMap2[u.idName + "_" + u.idNo] || accountMap3[u.idName + "_" + u.idNo]) {
                     signList.push(u);
                     signList.push(u);
                 } else {
                 } else {
                     unSignList.push(u);
                     unSignList.push(u);
@@ -1825,12 +1795,6 @@ class EcontractApi {
 
 
 
 
 
 
-    async findecontractoffline(mtchId,idNoList,idNameList){
-        return this.econtractofflineSve.findSignAccount(mtchId,idNoList,idNameList)
-    }
-
-
-
 }
 }
 
 
 module.exports = EcontractApi;
 module.exports = EcontractApi;

bpo-web/app/config/settings.js

@@ -20,7 +20,7 @@ var settings = {
     secret: "f99d413b767f09b5dff0b3610366cc46",
     secret: "f99d413b767f09b5dff0b3610366cc46",
   },
   },
   basepath: path.normalize(path.join(__dirname, '../..')),
   basepath: path.normalize(path.join(__dirname, '../..')),
-  port: process.env.NODE_PORT || 3334,
+  port: process.env.NODE_PORT || 3333,
   reqEsAddr: function () {
   reqEsAddr: function () {
     if (this.env == "dev") {
     if (this.env == "dev") {
       var localsettings = require("./localsettings");
       var localsettings = require("./localsettings");