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

src/biz/enterprise/enterprise.ts

@@ -12,6 +12,7 @@ import { createEnterprise, deleteEnterprise,findEnterpriseCount, findEnterpriseB
 import { EnterpriseListConfig } from "../../config/ojbectResultKeyConfig";
 import { BizError } from "../../util/bizError";
 import { checkChange, checkParamater, extractData, getTaskId } from "../../util/tools"
+import { FUHUAQILV } from "../../config/enum";
 
 
 /**
@@ -27,7 +28,6 @@ export async function registerEnterprise(uscc:string, param) {
     
     if ( dataBaseInfo&& dataBaseInfo.uscc)  throw new BizError(ERRORENUM.该企业已存在, `${param.uscc}已经在库中存在`);
 
-    param.isCreate = true;
     await createEnterprise(uscc, TaskId, param);
 
     return {isSuccess:true};
@@ -161,5 +161,8 @@ export async function enterpriseList(time:number, fuHuaQiUscc:string, industry:n
         dataList.push(changeData);
     });
 
+    dataBaseList.isNaturalPersonHolding = FUHUAQILV[dataBaseList.isNaturalPersonHolding];
+    dataBaseList.lv = FUHUAQILV[dataBaseList.lv];
+
     return {count, dataList};
 }
\ No newline at end of file