@domain.js/main 0.4.20 → 0.4.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/deps/rest/utils.js +0 -4
- package/package.json +1 -1
package/dist/deps/rest/utils.js
CHANGED
|
@@ -372,8 +372,6 @@ function Utils(cnf, deps) {
|
|
|
372
372
|
if (!params._showDeleted) {
|
|
373
373
|
if (Model.rawAttributes.isDeleted)
|
|
374
374
|
where.isDeleted = "no";
|
|
375
|
-
if (Model.rawAttributes.deletedAt)
|
|
376
|
-
where.deletedAt = null;
|
|
377
375
|
}
|
|
378
376
|
// 将搜索条件添加到主条件上
|
|
379
377
|
const searchOptRes = searchOpt(Model, params._searchs, params.q);
|
|
@@ -393,8 +391,6 @@ function Utils(cnf, deps) {
|
|
|
393
391
|
includeWhere[sequelize_1.Op.or] = [];
|
|
394
392
|
if (x.model.rawAttributes.isDeleted)
|
|
395
393
|
includeWhere[sequelize_1.Op.or].push({ isDeleted: "no" });
|
|
396
|
-
if (x.model.rawAttributes.deletedAt)
|
|
397
|
-
includeWhere[sequelize_1.Op.or].push({ deletedAt: null });
|
|
398
394
|
if (x.required === false)
|
|
399
395
|
includeWhere[sequelize_1.Op.or].push({ id: null });
|
|
400
396
|
}
|