no message

src/biz/fuHuqQi/base.ts

@@ -63,7 +63,11 @@ export async function selectFuHuaQiBaseData(uscc:string) {
  * @returns {isSuccess:true/false};
  */
 export async function updateFuHuaQiBaseData(uscc:string, param) {
-    tools.checkParamater("更新孵化器基础数据", BaseParamUpdateConfig, param);
+    let skipKeyList = [
+        "name","virtualEnterpriseNum","logonTime","incubatedAcreage","acreageTotal","acreagePersonalUse", "lv", "identificationTime", 
+        "industry", "institutionalNature", "liaison", "liaisonPhone", "personInCharge", "personInChargePhone", "hatchingGround"
+    ];
+    tools.checkParamater("更新孵化器基础数据", BaseParamUpdateConfig, param, skipKeyList);
 
     let baseDataInfo = await findFuHuaQiByUSCC(uscc);
     for (let key in param) {

src/biz/fuHuqQi/task.ts

@@ -28,7 +28,7 @@ export async function fuHuaQiTaskList(uscc:string) {
     let result = [];
 
     const TaskId = getTaskId(uscc);
-    let taskMap = await findFuHuaQiTaskByTaskId(TaskId, false);
+    let taskMap = await findFuHuaQiTaskByTaskId(TaskId);
 
     // let taskTypeMapConf = {};
     for (let key in TASKTYPEENUM) {

src/biz/fuHuqQi/user.ts

@@ -114,7 +114,9 @@ export async function logout(uscc:string):Promise<object> {
  */
  export async function fuHuaQiUserList(operationName:string, page:number) {
     let selectParam:any = {};
-    if (operationName) selectParam.operationName = operationName;
+    if (operationName) {
+        selectParam.operationName = {"$regex":`${operationName}`};;
+    }
 
     let enterpriseMap = await fuhuaqiData.groupFindFuHuaQi();
     let dataBaseList = await fuhuaqiData.findFuHuaQiUserList(selectParam, (page-1)*10 );

src/data/fuHuaQi/task.ts

@@ -46,8 +46,8 @@ export async function save(throwError=false) {
  * @param taskId 任务id
  * @returns {1:{}, 2:{}}
  */
-export async function findFuHuaQiTaskByTaskId(taskId:string, isSubmit:boolean) {
-    let findList = await fuHuaQiTaskModel.find({taskId, isSubmit}).exec() || [];
+export async function findFuHuaQiTaskByTaskId(taskId:string) {
+    let findList = await fuHuaQiTaskModel.find({taskId}).exec() || [];
     let taskMap = {};
     findList.forEach(item => {
         taskMap[item.type] = item;

src/routers/fuhuaqi.ts

@@ -308,7 +308,7 @@ async function submitTask(req, res) {
  */
 async function updateMyDataInfo(req, res) {
     let reqConf = {form: 'Object' };
-    let { form } = checkParamaterType(reqConf, req.body);
+    let { form } = checkReqParam(reqConf, req.body);
     const Uscc = req.headers.uscc;
 
     let result = await baseBiz.updateFuHuaQiBaseData(Uscc, form);

src/util/tools.ts

@@ -29,7 +29,7 @@ export function getTimeKey() {
  */
 export function checkParamater(name:string, keyTypeConf:object, param:object, skipKeys?) {
     for (let key in keyTypeConf ) {
-        if ( skipKeys && skipKeys.indexOf(key) > -1 ) {
+        if ( skipKeys && skipKeys.indexOf(key) > -1 && !param[key]) {
             continue;
         }
         if ( !param[key] ) throw new BizError(ERRORENUM.表单校验失败, name, `缺失${key}字段`);
@@ -140,7 +140,7 @@ export function checkReqParam(conf, param) {
         }
     }
     for (let key in param) {
-        if (!conf[key]) throw new BizError(ERRORENUM.表单校验失败, name, `多余${key}字段`);
+        if (!conf[key]) throw new BizError(ERRORENUM.表单校验失败, `多余${key}字段`);
     }
     return param;
 }
@@ -188,7 +188,7 @@ export function checkParamaterType(conf, param) {
         }
     }
     for (let key in param) {
-        if (!conf[key]) throw new BizError(ERRORENUM.表单校验失败, name, `多余${key}字段`);
+        if (!conf[key]) throw new BizError(ERRORENUM.表单校验失败, `多余${key}字段`);
     }
     return param;
 }