Merge branch 'center-order' of http://gitlab.gongsibao.com/jiangyong/zhichan into center-order

center-order/app/base/service/impl/dbneed/needsolutionSve.js

@@ -474,6 +474,7 @@ class NeedsolutionService extends ServiceBase {
     //   return system.getResultFail(-102,"状态不能为空");
     //   return system.getResultFail(-102,"状态不能为空");
     // }
     // }
     var needsolutioninfo = await this.dao.model.findOne({
     var needsolutioninfo = await this.dao.model.findOne({
+      attributes:["id","solutionContent","status","orderNo"],
       where: { channelSolutionNo: ab.channelSolutionNo,isInvalid:0 }, raw: true
       where: { channelSolutionNo: ab.channelSolutionNo,isInvalid:0 }, raw: true
     });
     });
     if (!needsolutioninfo || !needsolutioninfo.id) {
     if (!needsolutioninfo || !needsolutioninfo.id) {
@@ -791,6 +792,7 @@ class NeedsolutionService extends ServiceBase {
     }
     }
     //获取方案信息
     //获取方案信息
     var needsolutioninfo = await this.dao.model.findOne({
     var needsolutioninfo = await this.dao.model.findOne({
+      attributes:["id","needNo","solutionContent","status"],
       where: { channelSolutionNo: ab.BizId }, raw: true
       where: { channelSolutionNo: ab.BizId }, raw: true
     });
     });
     if (!needsolutioninfo || !needsolutioninfo.id) {
     if (!needsolutioninfo || !needsolutioninfo.id) {
@@ -880,9 +882,9 @@ class NeedsolutionService extends ServiceBase {
     var self = this;
     var self = this;
     return await this.db.transaction(async function (t) {
     return await this.db.transaction(async function (t) {
       await self.dao.update(needsolutioninfo, t);
       await self.dao.update(needsolutioninfo, t);
-      needsolutioninfo = await self.dao.model.findOne({
-        where: { channelSolutionNo: ab.BizId }, raw: true
-      });
+      // needsolutioninfo = await self.dao.model.findOne({
+      //   where: { channelSolutionNo: ab.BizId }, raw: true
+      // });
       statusObj["BizId"] = ab.BizId;
       statusObj["BizId"] = ab.BizId;
       return system.getResultSuccess(statusObj);
       return system.getResultSuccess(statusObj);
     })
     })