Merge branch 'master' of http://123.207.147.179:8888/node_server/yuyixcx

src/biz/enterpriseInfo.ts

@@ -21,9 +21,12 @@ import moment = require("moment");
 
 //==登录登出
 
-export async function enterpriseLogin(phone:string, pwd:string) {
+//企业用户表没有存uscc字段，先查询到企业eId，然后到用户表查询密码判断是否登录成功
+export async function enterpriseLogin(uscc:string, pwd:string) {
+    let dbInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {uscc}, ["eId"]);
+
     let filesList = ["userName", "eId", "pwd", "uId"];
-    let enterpriseInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业用户表, {phone}, filesList);
+    let enterpriseInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业用户表, {eId:dbInfo.eId}, filesList);
 
     if (!enterpriseInfo || !enterpriseInfo.eId) {
         throw new BizError(ERRORENUM.账号或密码错误);
@@ -560,7 +563,7 @@ export async function enterpriseQualificationInfo(eId) {
         return {dataInfo:addInfo};
     }
 
-    qualificationInfo.goPublicSector = JSON.parse(qualificationInfo.goPublicSector);
+    if (qualificationInfo.goPublicSector) qualificationInfo.goPublicSector = JSON.parse(qualificationInfo.goPublicSector);
     let resultInfo:any = extractData(EnterpriseQualificationInfoResConfig, qualificationInfo);
     
     resultInfo.kxTime= new Date(resultInfo.kxTime).valueOf();

src/routers/enterpriseInfo.ts

@@ -557,8 +557,8 @@ async function originateDel(req, res) {
  * @param res 
  */
 async function login(req, res) {
-    let {phone, pwd } = req.body
-    let result = await enterpriseInfoBiz.enterpriseLogin(phone, pwd );
+    let {uscc, pwd } = req.body
+    let result = await enterpriseInfoBiz.enterpriseLogin(uscc, pwd );
 
     res.success(result);
 }