项目流程发起问题

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -1636,8 +1636,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             else {
                 if (cmcProjectService.selectCmcProjectByProjectId(projectId) != null) //生产项目
                     flowTaskDto.setTitle(cmcProjectService.selectCmcProjectByProjectId(projectId).getProjectNumber() + "-" + cmcProjectService.selectCmcProjectByProjectId(projectId).getProjectName());
-                else
-                    flowTaskDto.setTitle(cmcBrandProjectService.selectCmcBrandProjectByProjectId(projectId).getProjectNumber()); //品牌项目
+                if (cmcBrandProjectService.selectCmcBrandProjectByProjectId(projectId) != null) //品牌项目
+                    flowTaskDto.setTitle(cmcBrandProjectService.selectCmcBrandProjectByProjectId(projectId).getProjectNumber());
             }
         }
         if (flowTaskDto.getProcDefName().contains("承接")) {

oa-ui/src/views/flowable/form/components/chooseTender.vue

@@ -25,7 +25,7 @@
       <!-- <el-table-column type="selection" width="50" align="center" :reserve-selection="true" /> -->
       <el-table-column label="投标项目名称" align="center" key="projectName" prop="projectName"
         :show-overflow-tooltip="true"  width="170px" />
-      <el-table-column label="招标业主" align="center" prop="partyA.partyAName" min-width="100px" />
+      <el-table-column label="招标业主" align="center" prop="partyAName" min-width="100px" />
       <el-table-column label="招标代理" align="center" prop="agent" min-width="100px" />
       <el-table-column label="招标地点" align="center" prop="place" min-width="100px" />
       <el-table-column label="业主预算" align="center" prop="budget" min-width="100px" />

oa-ui/src/views/oa/device/approval.vue

@@ -74,11 +74,11 @@
           <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="确认日期" align="center" prop="confirmDate" >
+      <!-- <el-table-column label="确认日期" align="center" prop="confirmDate" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.confirmDate, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="归还日期" align="center" prop="returnDate" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.returnDate, '{y}-{m}-{d}') }}</span>