明树Git Lab

Commit ff01bf1f authored by zfp1's avatar zfp1

1

parent 0f2ba0f8
Pipeline #108452 passed with stage
in 3 seconds
...@@ -95,7 +95,7 @@ async function getUserMessages(req, res, next) { ...@@ -95,7 +95,7 @@ async function getUserMessages(req, res, next) {
limit, limit,
offset, offset,
// raw: true, // raw: true,
order: [['createdAt', 'DESC']], order: [['id', 'DESC']],
}); });
console.log(ret); console.log(ret);
let messages = ret.rows || []; let messages = ret.rows || [];
......
...@@ -42,7 +42,7 @@ async function listPosition(req, res, next) { ...@@ -42,7 +42,7 @@ async function listPosition(req, res, next) {
let page = req.body.page || 1; let page = req.body.page || 1;
let limit = req.body.pageSize || 10; let limit = req.body.pageSize || 10;
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
if (req.body.name) { if (req.body.name) {
search.where = { search.where = {
[Op.or]: [ [Op.or]: [
......
...@@ -940,11 +940,11 @@ async function getProjectInfo(req, res, next) { ...@@ -940,11 +940,11 @@ async function getProjectInfo(req, res, next) {
return res.sendError(errorMessage.resourceNotFound); return res.sendError(errorMessage.resourceNotFound);
} }
let lixiang = await DB.ProjectLixiang.findOne({ let lixiang = await DB.ProjectLixiang.findOne({
order: [['createdAt', 'DESC']], order: [['id', 'DESC']],
where: { projectId: req.body.id, type: 1 }, where: { projectId: req.body.id, type: 1 },
}); });
let juece = await DB.ProjectLixiang.findOne({ let juece = await DB.ProjectLixiang.findOne({
order: [['createdAt', 'DESC']], order: [['id', 'DESC']],
where: { projectId: req.body.id, type: 2 }, where: { projectId: req.body.id, type: 2 },
}); });
...@@ -1034,7 +1034,7 @@ async function listProject(req, res, next) { ...@@ -1034,7 +1034,7 @@ async function listProject(req, res, next) {
where.projectLzType = { [Op.in]: projectLzTypes } where.projectLzType = { [Op.in]: projectLzTypes }
} }
console.log(projectLzTypes) console.log(projectLzTypes)
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
search.where = where; search.where = where;
search.limit = limit; search.limit = limit;
search.offset = offset; search.offset = offset;
......
...@@ -63,7 +63,7 @@ async function getCbglList(req, res, next) { ...@@ -63,7 +63,7 @@ async function getCbglList(req, res, next) {
let limit = req.body.pagesize || req.body.pageSize || 10; let limit = req.body.pagesize || req.body.pageSize || 10;
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
let search = {}; let search = {};
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
search.limit = limit; search.limit = limit;
search.offset = offset; search.offset = offset;
let where = { del: 0 }; let where = { del: 0 };
......
...@@ -42,7 +42,7 @@ async function getTzjhList(req, res, next) { ...@@ -42,7 +42,7 @@ async function getTzjhList(req, res, next) {
let limit = req.body.pagesize || req.body.pageSize || 10; let limit = req.body.pagesize || req.body.pageSize || 10;
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
let search = {}; let search = {};
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
search.limit = limit; search.limit = limit;
search.offset = offset; search.offset = offset;
let where = { del: 0 }; let where = { del: 0 };
...@@ -128,7 +128,7 @@ async function getXxbsList(req, res, next) { ...@@ -128,7 +128,7 @@ async function getXxbsList(req, res, next) {
let limit = req.body.pagesize || req.body.pageSize || 10; let limit = req.body.pagesize || req.body.pageSize || 10;
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
let search = {}; let search = {};
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
search.limit = limit; search.limit = limit;
search.offset = offset; search.offset = offset;
let where = { del: 0 }; let where = { del: 0 };
...@@ -215,7 +215,7 @@ async function getTzghList(req, res, next) { ...@@ -215,7 +215,7 @@ async function getTzghList(req, res, next) {
let limit = req.body.pagesize || req.body.pageSize || 10; let limit = req.body.pagesize || req.body.pageSize || 10;
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
let search = {}; let search = {};
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
search.limit = limit; search.limit = limit;
search.offset = offset; search.offset = offset;
let where = { del: 0 }; let where = { del: 0 };
...@@ -305,7 +305,7 @@ async function getTxjsList(req, res, next) { ...@@ -305,7 +305,7 @@ async function getTxjsList(req, res, next) {
let limit = req.body.pagesize || req.body.pageSize || 10; let limit = req.body.pagesize || req.body.pageSize || 10;
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
let search = {}; let search = {};
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
search.limit = limit; search.limit = limit;
search.offset = offset; search.offset = offset;
let where = { del: 0 }; let where = { del: 0 };
...@@ -430,7 +430,7 @@ async function getCgqyglList(req, res, next) { ...@@ -430,7 +430,7 @@ async function getCgqyglList(req, res, next) {
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
let search = {}; let search = {};
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
search.limit = limit; search.limit = limit;
search.offset = offset; search.offset = offset;
...@@ -510,7 +510,7 @@ async function getTwhglList(req, res, next) { ...@@ -510,7 +510,7 @@ async function getTwhglList(req, res, next) {
let limit = req.body.pagesize || req.body.pageSize || 10; let limit = req.body.pagesize || req.body.pageSize || 10;
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
let search = {}; let search = {};
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
search.limit = limit; search.limit = limit;
search.offset = offset; search.offset = offset;
let where = { del: 0 }; let where = { del: 0 };
...@@ -589,7 +589,7 @@ async function getXxhjsList(req, res, next) { ...@@ -589,7 +589,7 @@ async function getXxhjsList(req, res, next) {
let limit = req.body.pagesize || req.body.pageSize || 10; let limit = req.body.pagesize || req.body.pageSize || 10;
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
let search = {}; let search = {};
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
search.limit = limit; search.limit = limit;
search.offset = offset; search.offset = offset;
let where = { del: 0 }; let where = { del: 0 };
...@@ -672,7 +672,7 @@ async function getTzdaglList(req, res, next) { ...@@ -672,7 +672,7 @@ async function getTzdaglList(req, res, next) {
let limit = req.body.pagesize || req.body.pageSize || 10; let limit = req.body.pagesize || req.body.pageSize || 10;
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
let search = {}; let search = {};
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
search.limit = limit; search.limit = limit;
search.offset = offset; search.offset = offset;
let where = { del: 0 }; let where = { del: 0 };
......
...@@ -103,7 +103,7 @@ async function getYyqtzhsList(req, res, next) { ...@@ -103,7 +103,7 @@ async function getYyqtzhsList(req, res, next) {
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
let search = {}; let search = {};
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
search.limit = limit; search.limit = limit;
search.offset = offset; search.offset = offset;
...@@ -304,7 +304,7 @@ async function getYyqtzjcList(req, res, next) { ...@@ -304,7 +304,7 @@ async function getYyqtzjcList(req, res, next) {
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
let search = {}; let search = {};
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
search.limit = limit; search.limit = limit;
search.offset = offset; search.offset = offset;
...@@ -387,7 +387,7 @@ async function getTzhpjList(req, res, next) { ...@@ -387,7 +387,7 @@ async function getTzhpjList(req, res, next) {
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
let search = {}; let search = {};
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
search.limit = limit; search.limit = limit;
search.offset = offset; search.offset = offset;
......
...@@ -108,7 +108,7 @@ async function getTzmbzrsList(req, res, next) { ...@@ -108,7 +108,7 @@ async function getTzmbzrsList(req, res, next) {
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
let search = {}; let search = {};
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
search.limit = limit; search.limit = limit;
search.offset = offset; search.offset = offset;
...@@ -344,7 +344,7 @@ async function getTzkzList(req, res, next) { ...@@ -344,7 +344,7 @@ async function getTzkzList(req, res, next) {
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
let search = {}; let search = {};
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
search.limit = limit; search.limit = limit;
search.offset = offset; search.offset = offset;
...@@ -546,7 +546,7 @@ async function getZdfxList(req, res, next) { ...@@ -546,7 +546,7 @@ async function getZdfxList(req, res, next) {
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
let search = {}; let search = {};
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
search.limit = limit; search.limit = limit;
search.offset = offset; search.offset = offset;
...@@ -668,7 +668,7 @@ async function getJsqtzhsList(req, res, next) { ...@@ -668,7 +668,7 @@ async function getJsqtzhsList(req, res, next) {
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
let search = {}; let search = {};
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
search.limit = limit; search.limit = limit;
search.offset = offset; search.offset = offset;
...@@ -874,7 +874,7 @@ async function getJsqtzjcList(req, res, next) { ...@@ -874,7 +874,7 @@ async function getJsqtzjcList(req, res, next) {
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
let search = {}; let search = {};
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
search.limit = limit; search.limit = limit;
search.offset = offset; search.offset = offset;
...@@ -1013,7 +1013,7 @@ async function getZdsxspList(req, res, next) { ...@@ -1013,7 +1013,7 @@ async function getZdsxspList(req, res, next) {
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
let search = {}; let search = {};
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
search.limit = limit; search.limit = limit;
search.offset = offset; search.offset = offset;
...@@ -1131,7 +1131,7 @@ async function getXmtcList(req, res, next) { ...@@ -1131,7 +1131,7 @@ async function getXmtcList(req, res, next) {
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
let search = {}; let search = {};
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
search.limit = limit; search.limit = limit;
search.offset = offset; search.offset = offset;
......
...@@ -90,7 +90,7 @@ async function listRole(req, res, next) { ...@@ -90,7 +90,7 @@ async function listRole(req, res, next) {
let page = req.body.page || 1; let page = req.body.page || 1;
let limit = req.body.pageSize || 10; let limit = req.body.pageSize || 10;
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
if (req.body.name) { if (req.body.name) {
search.where = { search.where = {
[Op.or]: [ [Op.or]: [
......
...@@ -38,7 +38,7 @@ async function getXmtzzjllTem({ startYear, endYear, tampName, projectId }) { ...@@ -38,7 +38,7 @@ async function getXmtzzjllTem({ startYear, endYear, tampName, projectId }) {
let rows = []; // 5 是模板有5行 let rows = []; // 5 是模板有5行
if (projectId) { if (projectId) {
let excelData = await DB.ProjectExcelData.findOne({ let excelData = await DB.ProjectExcelData.findOne({
order: [['createdAt', 'DESC']], order: [['id', 'DESC']],
where: { projectId: projectId, del: 0, tampName }, where: { projectId: projectId, del: 0, tampName },
attributes: ['data', 'createdAt', 'id'], attributes: ['data', 'createdAt', 'id'],
raw: true, raw: true,
......
...@@ -304,7 +304,7 @@ async function listUser(req, res, next) { ...@@ -304,7 +304,7 @@ async function listUser(req, res, next) {
let page = req.body.page || 1; let page = req.body.page || 1;
let limit = req.body.pageSize || 10; let limit = req.body.pageSize || 10;
let offset = (page - 1) * limit; let offset = (page - 1) * limit;
search.order = [['createdAt', 'DESC']]; search.order = [['id', 'DESC']];
if (req.body.name) { if (req.body.name) {
search.where = { search.where = {
[Op.or]: [ [Op.or]: [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment