提工时成功统计bug

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java

@@ -632,7 +632,7 @@ public class ReportController {
                     int finalPid = projectId[i];
                     Integer finalGroupId = groupId[i];
                     TaskGroup targetGroup = groupList.stream().filter(g->g.getId().equals(finalGroupId)).findFirst().orElse(null);
-                    if (targetGroup == null || targetGroup.getInchargerId() == null) {
+                    if (targetGroup == null || StringUtils.isEmpty(targetGroup.getInchargerId())) {
                         //没有分组的情况或者分组没有设置负责人的情况下，返回错误信息
                         HttpRespMsg msg = new HttpRespMsg();
                         msg.setError("请设置"+projectList.stream().filter(project -> project.getId().equals(finalPid)).findFirst().get().getProjectName()+

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -608,7 +608,7 @@
                 </el-form-item>
             </el-form>
             <span slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="exportUsers">{{ $t('export.export') }}</el-button>
+                <el-button type="primary" @click="exportUsers" :loading="isExporting">{{ $t('export.export') }}</el-button>
             </span>
         </el-dialog>
         <!-- 转让超级管理员权限 -->
@@ -946,6 +946,7 @@ export default {
   },
   data() {
     return {
+      isExporting: false,
       isSyncContact: false,
       showSyncDDDialog: false,
       transferActiveDialogFlag:false,
@@ -2436,12 +2437,14 @@ export default {
       this.exportDialogVisible = true;
     },
     exportUsers() {
+      this.isExporting = true;
       this.http.post(
         "/user/exportUsers",
         {
           containInvalid: this.containInvalid,
         },
         (res) => {
+          this.isExporting = false;
           if (res.code == "ok") {
             this.exportDialogVisible = false;
             var aTag = document.createElement("a");

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -8100,10 +8100,16 @@
                                             type: "error"
                                         });
                                     } else if (this.totalReportHours < this.workForm.time.workHours) {
-                                        this.$message({
-                                            message: '还剩余'+(this.workForm.time.workHours-this.totalReportHours).toFixed(1)+'h考勤时长尚未分配',
-                                            type: "error"
+                                        this.$confirm('还剩余'+(this.workForm.time.workHours-this.totalReportHours).toFixed(1)+'h考勤时长尚未分配,是否确定提交', this.$t('other.prompts'), {
+                                            confirmButtonText: this.$t('btn.determine'),
+                                            cancelButtonText: this.$t('btn.cancel'),
+                                            type: 'warning'
+                                        }).then(() => {
+                                            this.submitReportSon()
+                                        }).catch(() => {
                                         });
+                                    } else {
+                                        this.submitReportSon();
                                     }
                                 }
                             } else {