Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/controller/setting_controller.js

@@ -204,7 +204,7 @@ module.exports = app => {
                 // 获取验证规则
                 const rule = ctx.service.projectAccount.rule('add');
                 ctx.validate(rule);
-
+                ctx.request.body.project_id = projectData.id;
                 const result = await ctx.service.projectAccount.save(ctx.request.body);
                 if (!result) {
                     throw '保存账号数据失败';

app/service/project_account.js

@@ -331,7 +331,7 @@ module.exports = app => {
                 const accountData = await this.db.select(this.tableName, {
                     where: {
                         account: data.account,
-                        project_id: data.enterprise_id,
+                        project_id: data.project_id,
                     },
                 });
                 if (accountData.length > 0) {