获取首页基础信（首页顶端数据） 加入基础数据校验

src/biz/mobileEnterprise/enterprise.ts

@@ -11,7 +11,7 @@ import * as enterpriseData from "../../data/enterprise/enterprise";
 import { selectFinancingInfo } from "../../data/enterprise/financingInfo";
 import { findEnterpriseNewTeamData } from "../../data/enterprise/team";
 import { BizError } from "../../util/bizError";
-import { checkChange, extractData } from "../../util/piecemeal";
+import { checkChange, checkDataHaveNull, extractData } from "../../util/piecemeal";
 import { eccEnumValue } from "../../util/verificationEnum";
 import { eccFormParam } from "../../util/verificationParam";
 
@@ -45,20 +45,20 @@ export async function getHomePageHeaderData(uscc:string) {
     let name = enterpriseInfo.name;
 
     let newTeamInfo = await findEnterpriseNewTeamData(uscc);
-    let teamInfo = !paramIsNull(newTeamInfo) ?  newTeamInfo : {doctor:0, master:0, undergraduate:0, juniorCollege:0, other:0 };
+    let teamInfo = Object.keys(newTeamInfo).length > 0 ?  newTeamInfo : {doctor:0, master:0, undergraduate:0, juniorCollege:0, other:0 };
 
     //团队总数
     let memberCount = teamInfo.doctor + teamInfo.master+ teamInfo.undergraduate+ teamInfo.juniorCollege+ teamInfo.other;
 
     let initialTeam = enterpriseInfo.initialTeam.length == 0;//创始团队缺失 true=缺失 
-    let qualification = paramIsNull(enterpriseInfo.qualification);//企业资质缺失 true=缺失 需要标红
-    let intellectualProperty = paramIsNull(enterpriseInfo.intellectualProperty);//知识产权缺失 true=缺失 需要标红
+    let qualification = checkDataHaveNull(enterpriseInfo.qualification, false);//企业资质缺失 true=缺失 需要标红
+    let intellectualProperty = checkDataHaveNull(enterpriseInfo.intellectualProperty, false);//知识产权缺失 true=缺失 需要标红
 
     let financingInfo = await selectFinancingInfo(uscc);//融资情况缺失 true=缺失 需要标红
-    let financing = paramIsNull(financingInfo);
+    let financing = checkDataHaveNull(financingInfo, false);
 
-    //todo
-    let baseInfo = paramIsNull({});//基本信息缺失 true=缺失 需要标红
+    let checkEnterpriseInfo = extractData(EnterpriseBaseConfig, enterpriseInfo, false);
+    let baseInfo = checkDataHaveNull(checkEnterpriseInfo, true)
 
     return {
         name,

src/util/piecemeal.ts

@@ -40,3 +40,24 @@ export function extractData(conf, data, isAdmin) {
     }
     return result;
 }
+
+
+/**
+ * 校验数据对象是否有空
+ * @param data 
+ * @param sensitive  敏感校验  true时  0 和 ""会校验失败  false时 校验成功
+ * @returns true/false true = 有空值   false=无空值
+ */
+export function checkDataHaveNull(data:object, sensitive:boolean) {
+    if (Array.isArray(data)) return data.length == 0;
+    if (Object.keys(data).length == 0) return true;
+    
+    let success = false;
+    for (let key in data) {
+        if (data[key] == null || data[key] == undefined) success = true;
+        if (sensitive) {
+            if (data[key] == 0 || data[key] == "" ) success = true;
+        }
+    }
+    return success;
+}
\ No newline at end of file