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

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

@@ -172,17 +172,17 @@ class NeedinfoService extends ServiceBase {
   async getItemByChannelSolutionNo(pobj) {
   async getItemByChannelSolutionNo(pobj) {
     var solutionitem = await this.needsolutionDao.findOne({ channelSolutionNo: pobj.actionBody.bizId });
     var solutionitem = await this.needsolutionDao.findOne({ channelSolutionNo: pobj.actionBody.bizId });
     if (!solutionitem) {
     if (!solutionitem) {
-      return system.getResult(null, "需求数据为空，30210");
+      return system.getResult(null, "方案数据为空，30210");
     }
     }
     var item = await this.dao.getItemByNeedNo(solutionitem.needNo);
     var item = await this.dao.getItemByNeedNo(solutionitem.needNo);
+    if (!item) {
+      return system.getResult(null, "需求数据为空，30210");
+    }
     // fixme 阿里直购需要更改
     // fixme 阿里直购需要更改
     item.solutionProvince = solutionitem.solutionContent.solution.Area
     item.solutionProvince = solutionitem.solutionContent.solution.Area
     //item.solutionProvince = solutionitem.solutionContent.solution.Area + `（${solutionitem.solutionContent.solution.actionType}）`//北京（新办）;
     //item.solutionProvince = solutionitem.solutionContent.solution.Area + `（${solutionitem.solutionContent.solution.actionType}）`//北京（新办）;
     item.solutionContent = solutionitem.solutionContent
     item.solutionContent = solutionitem.solutionContent
     item.channelSolutionNo = solutionitem.channelSolutionNo
     item.channelSolutionNo = solutionitem.channelSolutionNo
-    if (!item) {
-      return system.getResult(null, "需求数据为空，30210");
-    }
     return system.getResultSuccess(item);
     return system.getResultSuccess(item);
   }
   }