where条件参数

src/biz/mysql/findData.ts

@@ -5,7 +5,7 @@ import { BizError } from "../../util/bizError";
 
 
 /**
- * 
+ * where条件查询参数
  * @param param 
  * %like%：模糊查询 {列名: {"%like%": }}
  * %gt%：大于 {列名: {"%gt%": }}
@@ -20,36 +20,36 @@ import { BizError } from "../../util/bizError";
 function analysisParamToWhere(param, column) {
     let where = {};
     for (let key in param) {
-        where[key] = {};
-        for (let whereKey in param[key]){
-            switch(whereKey) {
-                case "%like%":
-                    where[key][Op.like] = `%${param[key]["%like%"]}%`;
-                break;
-                case "%gt%":
-                    where[key][Op.gt] = param[key]["%gt%"];
-                break;
-                case "%gte%":
-                    where[key][Op.gte] = param[key]["%gte%"];
-                break;
-                case "%lt%":
-                    where[key][Op.lt] = param[key]["%lt%"];
-                break;
-                case "%lte%":
-                    where[key][Op.lte] = param[key]["%lte%"];
-                break;
-                case "%between%":
-                    where[key][Op.between] = param[key]["%between%"];
-                break;
-                case "%notBetween%":
-                    where[key][Op.notBetween] = param[key]["%notBetween%"];
-                break;
-                default:
-                    where[key] = param[key];
-                break;
+        if (typeof param[key] == "object") {
+            where[key] = {};
+            for (let whereKey in param[key]){
+                switch(whereKey) {
+                    case "%like%":
+                        where[key][Op.like] = `%${param[key]["%like%"]}%`;
+                    break;
+                    case "%gt%":
+                        where[key][Op.gt] = param[key]["%gt%"];
+                    break;
+                    case "%gte%":
+                        where[key][Op.gte] = param[key]["%gte%"];
+                    break;
+                    case "%lt%":
+                        where[key][Op.lt] = param[key]["%lt%"];
+                    break;
+                    case "%lte%":
+                        where[key][Op.lte] = param[key]["%lte%"];
+                    break;
+                    case "%between%":
+                        where[key][Op.between] = param[key]["%between%"];
+                    break;
+                    case "%notBetween%":
+                        where[key][Op.notBetween] = param[key]["%notBetween%"];
+                    break;
+                }
             }
+        }else {
+            where[key] = param[key];
         }
-        
     }
 
     let selectParam:any = {where};

src/config/mysqlTableConfig.ts

@@ -167,7 +167,6 @@ export const TablesConfig = [
             pmId: {type:Sequelize.STRING(100), allowNull:false}, //党员信息表id 外键
             payType: {type:Sequelize.INTEGER, allowNull:false, defaultValue:2}, //缴纳状态 1：已缴纳、2：未缴纳
             payableMonth: {type:Sequelize.DATE, allowNull:false}, //应交月份
-            bId: {type:Sequelize.STRING(100), allowNull:false, defaultValue:'[]'}, //支部表id 外键 [1,2] --多选
             payTime: {type:Sequelize.DATE, allowNull:true}, //缴费时间
             payAmount: {type:Sequelize.INTEGER, allowNull:false}, //缴费金额（元）
         },