Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/CompanyServiceImpl.java

@@ -186,13 +186,14 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
                 }
             }
             //充当审批人员参与的项目
-            List<ProjectApprove> projectss = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("approver_id", userVO.getId()));
+            List<ProjectApprove> projectss = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("approver_id", currentUser.getId()));
             if (projectss.size() > 0) {
                 for (ProjectApprove projectUser : projectss) {
                     set.add(projectUser.getProjectId());
                 }
             }
             List<Mould> moulds = mouldMapper.selectList(new QueryWrapper<Mould>().in("project_id",set));
+            System.out.println(set + "_____" +  moulds);
             List<Integer> mouldIds = new ArrayList<>();
             for (Mould mould : moulds) {
                 mouldIds.add(mould.getId());

ys_vue/src/views/mold/moldDetail.vue

@@ -206,7 +206,8 @@
                         </el-table-column>
                         <el-table-column prop="part3dFile.fileName" label="3D图档" width="200" sortable>
                             <template slot-scope="scope" v-if="scope.row.part3dFile != null">
-                                <a class="download" :href="scope.row.part3dFile.fileUrl" :download="scope.row.part3dFile.fileName">{{scope.row.part3dFile.fileName}}</a>
+                                <a class="download" :href="scope.row.part3dFile.fileUrl" target="_blank">{{scope.row.part3dFile.fileName}}</a> 
+                                <!--  :download="scope.row.part3dFile.fileName" -->
                             </template>
                         </el-table-column>
                         <el-table-column prop="part2dFile.fileName" label="2D图档" width="200" sortable>