|
@@ -285,7 +285,6 @@ module.exports = app => {
|
|
|
// const contractAudit = await this.ctx.service.contractAudit.getDataByCondition({ spid: spAudit.spid, uid: spAudit.uid });
|
|
// const contractAudit = await this.ctx.service.contractAudit.getDataByCondition({ spid: spAudit.spid, uid: spAudit.uid });
|
|
|
// const contractPermission = x.contract_permission ? this._.map(x.contract_permission.split(','), this._.toInteger) : [];
|
|
// const contractPermission = x.contract_permission ? this._.map(x.contract_permission.split(','), this._.toInteger) : [];
|
|
|
// const newContractPermission = contractPermission.length > 0 ? await this.getContractPermission(contractPermission) : [];
|
|
// const newContractPermission = contractPermission.length > 0 ? await this.getContractPermission(contractPermission) : [];
|
|
|
- // console.log(newContractPermission, contractAudit);
|
|
|
|
|
// if (!contractAudit && contractPermission.length === 0) continue;
|
|
// if (!contractAudit && contractPermission.length === 0) continue;
|
|
|
// if (contractAudit) {
|
|
// if (contractAudit) {
|
|
|
// if (contractPermission.length === 0 || this._.intersection([3,4,5], contractPermission).length === 0) {
|
|
// if (contractPermission.length === 0 || this._.intersection([3,4,5], contractPermission).length === 0) {
|
|
@@ -347,7 +346,7 @@ module.exports = app => {
|
|
|
|
|
|
|
|
const insertData = [], updateData = [];
|
|
const insertData = [], updateData = [];
|
|
|
for (const spid of copyData.spid) {
|
|
for (const spid of copyData.spid) {
|
|
|
- const exist = await this.getAllDataByCondition({ columns: ['uid'], where: { spid } });
|
|
|
|
|
|
|
+ const exist = await this.getAllDataByCondition({ columns: ['id', 'uid'], where: { spid } });
|
|
|
copyPermission.forEach(cp => {
|
|
copyPermission.forEach(cp => {
|
|
|
const ecp = exist.find(x => { return x.uid === cp.uid; });
|
|
const ecp = exist.find(x => { return x.uid === cp.uid; });
|
|
|
if (!ecp) {
|
|
if (!ecp) {
|