Browse Source

合并代码

master
巴林闲侠 2 years ago
parent
commit
eb4b295a9f
  1. 17
      api/app/lib/controllers/member/index.js

17
api/app/lib/controllers/member/index.js

@ -1,7 +1,7 @@
'use strict';
const moment = require('moment')
async function add(ctx) {
async function add (ctx) {
try {
const { models } = ctx.fs.dc;
const {
@ -44,7 +44,7 @@ async function add(ctx) {
}
}
async function edit(ctx) {
async function edit (ctx) {
try {
const { models } = ctx.fs.dc;
const {
@ -84,7 +84,7 @@ async function edit(ctx) {
}
}
async function searchPepMember(ctx) {
async function searchPepMember (ctx) {
try {
const { models } = ctx.fs.dc;
const { clickHouse } = ctx.app.fs
@ -160,7 +160,7 @@ async function searchPepMember(ctx) {
}
}
async function del(ctx) {
async function del (ctx) {
try {
const { models } = ctx.fs.dc;
const { pepUserId } = ctx.query
@ -183,7 +183,7 @@ async function del(ctx) {
}
}
async function list(ctx) {
async function list (ctx) {
try {
const { models } = ctx.fs.dc;
const { judgeHoliday } = ctx.app.fs.utils
@ -524,7 +524,10 @@ async function exportData (ctx) {
ctx.body = {
message: typeof error == 'string' ? error : undefined
}
async function addMembersBulk(ctx) {
}
}
async function addMembersBulk (ctx) {
let errorMsg = { message: '批量添加员工信息失败' };
const transaction = await ctx.fs.dc.orm.transaction();
try {
@ -601,4 +604,4 @@ module.exports = {
vacateStatistics,
exportData,
addMembersBulk
};
}
Loading…
Cancel
Save