Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -11537,8 +11537,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         Report report = reportMapper.selectOne(new QueryWrapper<Report>().select("sum(working_time) as working_time").eq("project_id", projectId).and(i->i.eq("state", 0).or().eq("state", 1)));
         Report waiting = reportMapper.selectOne(new QueryWrapper<Report>().select("sum(working_time) as working_time").eq("project_id", projectId).eq("state", 0));
         HashMap map = new HashMap();
-        map.put("total",report.getWorkingTime());
-        map.put("waiting",waiting.getWorkingTime());
+        map.put("total",report == null?0:report.getWorkingTime());
+        map.put("waiting",waiting==null?0:waiting.getWorkingTime());
         HttpRespMsg msg = new HttpRespMsg();
         msg.setData(map);
         return msg;

fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -57,7 +57,7 @@
                                         <el-dropdown-item divided @click.native="renameGroup(item)" :disabled="!(projectCreatorId == user.id || projectInchargerId == user.id || permissions.projectManagement || isManageDept)">
                                             <i class="el-icon-edit"></i>
                                             {{ $t('changegroups') }}</el-dropdown-item>
-                                        <el-dropdown-item divided @click.native="setManDay(item)" :disabled="!(projectCreatorId == user.id || projectInchargerId == user.id || permissions.projectManagement || isManageDept)">
+                                        <el-dropdown-item divided @click.native="setManDay(item)" v-if="user.timeType.projectManDay==1" :disabled="!(projectCreatorId == user.id || projectInchargerId == user.id || permissions.projectManagement || isManageDept)">
                                             <i class="el-icon-time"></i>
                                             预估工时</el-dropdown-item>
                                         <el-dropdown-item divided @click.native="addToTemplate(item)" :disabled="!(projectCreatorId == user.id || projectInchargerId == user.id || permissions.projectManagement || isManageDept)">