Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/controller/budget_controller.js

@@ -237,7 +237,7 @@ module.exports = app => {
         }
         async _getNeedGcl() {
             if (!this.ctx.params.btype) throw '参数错误';
-            const funRela = this.ctx.service.project.getFunRela(this.ctx.session.sessionProject.id);
+            const funRela = await this.ctx.service.project.getFunRela(this.ctx.session.sessionProject.id);
             return this.ctx.params.btype === 'yu' && !!funRela.needGcl;
         }
 

app/service/project.js

@@ -162,7 +162,7 @@ module.exports = app => {
             const result = await this.db.update(this.tableName, {
                 id: id, fun_rela: JSON.stringify({
                     banOver: data.banOver, hintOver: data.hintOver,
-                    imType: data.imType
+                    imType: data.imType, needGcl: data.needGcl,
                 }),
             });
             return result.affectedRows === 1;