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

src/biz/fuHuqQi/base.ts

@@ -10,6 +10,7 @@ import { findEnterpriseCount, findEnterpriseCountByFuHuaQiUscc, groupFindEnterpr
 import { findFuHuaQiByUSCC, findFuHuaQiCount, findFuHuaQiList, groupFindFuHuaQi } from "../../data/fuHuaQi/fuhuaqi";
 import * as tools from "../../util/tools";
 import { FuHuaQiBaseListConfig } from "../../config/ojbectResultKeyConfig";
+import { FUHUAQILV } from "../../config/enum";
 
 
 /**
@@ -66,7 +67,7 @@ export async function selectFuHuaQiBaseData(uscc:string) {
  */
 export async function homeData(uscc:string) {
     let dataBaseInfo = await findFuHuaQiByUSCC(uscc);
-    let keyList = [ "incubatedAcreage", "acreageTotal", "acreagePersonalUse", "name"];
+    let keyList = [ "incubatedAcreage", "acreageTotal", "acreagePersonalUse", "name", "lv", "institutionalNature"];
     let data:any = {enterpriseCount:0};
 
     keyList.forEach( key => {
@@ -74,7 +75,8 @@ export async function homeData(uscc:string) {
     });
 
     data.enterpriseCount  = await findEnterpriseCountByFuHuaQiUscc(uscc);
-    
+    data.lv = FUHUAQILV[dataBaseInfo.lv];
+    data.institutionalNature = FUHUAQILV[dataBaseInfo.institutionalNature];
     return data;
 }
 

src/routers/fuhuaqi.ts

@@ -16,7 +16,7 @@ export function setRouter(httpServer) {
     httpServer.post('/fuhuaqi/login/firstupdate', checkFuHuaQiToken, asyncHandler(firstUpdatePwd));
     
     /**基础数据 */
-    httpServer.post('/fuhuaqi/base', checkFuHuaQiToken, asyncHandler(baseInfo));
+    httpServer.post('/fuhuaqi/base', asyncHandler(baseInfo));
     httpServer.post('/fuhuaqi/mydata', asyncHandler(myDataInfo));
     httpServer.post('/fuhuaqi/base/update', checkFuHuaQiToken, asyncHandler(updateMyDataInfo));
     /**任务 */
@@ -34,7 +34,7 @@ export function setRouter(httpServer) {
     httpServer.post('/fuhuaqi/financing/update', checkFuHuaQiToken, asyncHandler(updateFinancingInfo));
     httpServer.post('/fuhuaqi/financing/select', asyncHandler(selectEnterpriseFinancingInfo));
     httpServer.post('/fuhuaqi/financing/delete', checkFuHuaQiToken, asyncHandler(delEnterpriseFinancingInfo));
-    httpServer.post('/admin/financing/namelist', asyncHandler(getFinancingInfoByName));
+    httpServer.post('/admin/financing/namelist', checkFuHuaQiToken, asyncHandler(getFinancingInfoByName));
 
     /**新注册或迁入企业 */
     httpServer.post('/fuhuaqi/enterprise/register', checkFuHuaQiToken, asyncHandler(registerEnterprise));