no message

src/biz/enterprise/enterprise.ts

@@ -10,9 +10,9 @@ import { EnterpriseInfoConfig } from "../../config/ojbectResultKeyConfig";
 import { BizError } from "../../util/bizError";
 import { checkChange, checkParamater, extractData, getTaskId } from "../../util/tools"
 import moment = require("moment");
-import { createEnterprise, deleteEnterprise,findEnterpriseCount, findEnterpriseByUscc, findEnterpriseList, findEnterpriseListByFuHuaQiUsccName } from "../../data/enterprise/enterprise";
+import { createEnterprise, deleteEnterprise,findEnterpriseCount, findEnterpriseByUscc, findEnterpriseList, findEnterpriseListByFuHuaQiUsccName, 查询所有已绑定过的孵化器id } from "../../data/enterprise/enterprise";
 import { EnterpriseListConfig } from "../../config/ojbectResultKeyConfig";
-import { findFuHuaQiByUSCC } from "../../data/fuHuaQi/fuhuaqi";
+import { findAllFuHuaQi, findFuHuaQiByUSCC } from "../../data/fuHuaQi/fuhuaqi";
 
 
 /**
@@ -185,18 +185,27 @@ export async function enterpriseList(time:string, fuHuaQiUscc:string, industry,
 }
 
 
-export async function getAffiliationFuHuaQi(fuHuaQiUscc: string) {
+export async function getAffiliationFuHuaQi() {
     let  dataList = [];
-    if (fuHuaQiUscc.length  >  0) {
-        let dataBaseInfo = await findEnterpriseListByFuHuaQiUsccName(fuHuaQiUscc);
-        let uscc;
-        dataBaseInfo.forEach( async info => {
-            uscc = info.fuHuaQiUscc;
-        })
-        
-        let fuHuaQiInfo = await findFuHuaQiByUSCC(uscc);
-        dataList.push(fuHuaQiInfo.name)
-    }
+    let list = await 查询所有已绑定过的孵化器id();
+
+    let allList = await findAllFuHuaQi();
+    let distinctMap = {}; // {uscc:name}
+    allList.forEach(info => {
+        distinctMap[info.uscc] = info.name;
+    });
+
+    let result = [];
+    list.forEach(fuHuaQiUscc => {
+        let fuHuaQiName = distinctMap[fuHuaQiUscc];
+        if ( fuHuaQiName ) {
+            result.push({
+                name:fuHuaQiName,
+                uscc:fuHuaQiUscc
+            });
+        }
+    });
+
     
     return {dataList}
 }

src/data/enterprise/enterprise.ts

@@ -96,7 +96,7 @@ export async function createEnterprise(fuHuaQiUscc:string, taskId:string, param)
  * @returns number  孵化器拥有的企业数量
  */
 export async function findEnterpriseCountByFuHuaQiUscc(fuHuaQiUscc:string) {
-    return await enterpriseModel.count({fuHuaQiUscc}).exec();
+    return await enterpriseModel.find({fuHuaQiUscc}).count();
 }
 
 
@@ -164,3 +164,8 @@ export async function findEnterpriseInfoByName(name:string) {
 export async function findEnterpriseListByFuHuaQiUsccName(fuHuaQiUscc:string) {
     return await enterpriseModel.find({fuHuaQiUscc});
 }
+
+
+export async function 查询所有已绑定过的孵化器id() {
+    return await enterpriseModel.distinct('fuHuaQiUscc');
+}
\ No newline at end of file

src/routers/admin.ts

@@ -136,9 +136,6 @@ async function addUser(req, res) {
 
 
 async function affiliationFuHuaQi(req, res) {
-    let reqConf = {fuHuaQiUscc: 'String'};
-    let { fuHuaQiUscc } = checkParamaterType(reqConf, req.body);
-
-    let  result = await enterpriseBiz.getAffiliationFuHuaQi(fuHuaQiUscc);
+    let  result = await enterpriseBiz.getAffiliationFuHuaQi();
     res.success(result);
 }
\ No newline at end of file