绎维垃圾数据，审核人空指针导致待审核消息发送中断

无考勤时要支持暂存

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -591,7 +591,7 @@ public class TimingTask {
             List<Map<String, Object>> result1 = reportMapper.getDeptWaitingApproveCnt(companyDingding.getCompanyId());
             List<Object> resultCorpwxUserIds = result.stream().map(rl -> rl.get("auditorDDId")).collect(Collectors.toList());
             for (Map<String, Object> map : result) {
-                Optional<Map<String, Object>> first = result1.stream().filter(r1 -> r1.get("auditorDDId").equals(map.get("auditorDDId"))).findFirst();
+                Optional<Map<String, Object>> first = result1.stream().filter(r1 -> r1.get("auditorDDId") != null && r1.get("auditorDDId").equals(map.get("auditorDDId"))).findFirst();
                 Long num = Long.valueOf(String.valueOf(map.get("num")));
                 BigDecimal bigDecimal=new BigDecimal(num);
                 if(first.isPresent()){
@@ -601,7 +601,7 @@ public class TimingTask {
                         bigDecimal.longValue(), (String)map.get("auditorDDId"));
             }
             for (Map<String, Object> map : result1) {
-                if(!resultCorpwxUserIds.stream().anyMatch(ol->((String)ol).equals(map.get("auditorDDId")))){
+                if(!resultCorpwxUserIds.stream().anyMatch(ol->ol != null && ((String)ol).equals(map.get("auditorDDId")))){
                     Long num = Long.valueOf(String.valueOf(map.get("num")));
                     BigDecimal bigDecimal=new BigDecimal(num);
                     companyDingdingService.sendReportWaitingApplyMsg(companyDingding.getCompanyId(), companyDingding.getAgentId(),
@@ -616,7 +616,7 @@ public class TimingTask {
                 List<Map<String, Object>> result1 = reportMapper.getDeptWaitingApproveCnt(wxCorpInfo.getCompanyId());
                 List<Object> resultCorpwxUserIds = result.stream().map(rl -> rl.get("corpwxUserid")).collect(Collectors.toList());
                 for (Map<String, Object> map : result) {
-                    Optional<Map<String, Object>> first = result1.stream().filter(r1 -> r1.get("corpwxUserid").equals(map.get("corpwxUserid"))).findFirst();
+                    Optional<Map<String, Object>> first = result1.stream().filter(r1 -> r1.get("corpwxUserid") != null && r1.get("corpwxUserid").equals(map.get("corpwxUserid"))).findFirst();
                     if(map.get("corpwxUserid")!=null){
                     String corpwxUserid = (String) map.get("corpwxUserid");
                     //推送到企业微信
@@ -643,7 +643,7 @@ public class TimingTask {
                     }
                 }
                 for (Map<String, Object> map : result1) {
-                    if(!resultCorpwxUserIds.stream().anyMatch(ol->((String)ol).equals(map.get("corpwxUserid")))){
+                    if(!resultCorpwxUserIds.stream().anyMatch(ol->ol != null && ((String)ol).equals(map.get("corpwxUserid")))){
                         if(map.get("corpwxUserid")!=null){
                             String corpwxUserid = (String) map.get("corpwxUserid");
                             //推送到企业微信

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

@@ -3340,7 +3340,6 @@
                 this.$router.push(path);
                 this.getTaskGroups();
                 this.getDetail()
-                this.$refs.fileCenter.clearPathList()
                 this.$refs.fileCenter.refreshPage();
                 this.$refs.projectInfo.refreshPage();
                 this.$refs.summary.refreshPage();

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

@@ -457,7 +457,7 @@
                             </el-select>
                             </template>
                             
-                            <el-link v-if="(index >= 1 || workForm.domains.length > 0)&&domain.canEdit" type="primary" :underline="false" @click="delDomain(index)" style="float:right;margin-right:15%;"
+                            <el-link v-if="(index >= 1 || workForm.domains.length > 1)&&domain.canEdit" type="primary" :underline="false" @click="delDomain(index)" style="float:right;margin-right:15%;"
                                 :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)">
                                 <i class="fa fa-trash" style="color: red;;font-size:18px;"></i>
                             </el-link>
@@ -637,7 +637,7 @@
                                 </el-select>
                                 </template>
 
-                                <el-link v-if="(index >= 1 || workForm.domains.length > 0)&&domain.canEdit" type="primary" :underline="false" @click="delDomain(index)" style="float:right;margin-right:10px;"
+                                <el-link v-if="(index >= 1 || workForm.domains.length > 1)&&domain.canEdit" type="primary" :underline="false" @click="delDomain(index)" style="float:right;margin-right:10px;"
                                     :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)">
                                     <i class="fa fa-trash" style="color: red;;font-size:18px;"></i>
                                 </el-link>

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -1771,16 +1771,22 @@ import timetoolVue from '../timetool/timetool.vue';
             submitReport() {
                 this.$refs.loginForm.validate().then(
                 ()=>{
-                // 验证通过
-                    if(this.totalReportHours < this.user.timeType.allday){
-                        this.$dialog.confirm({
-                            title: '提示',
-                            message: '当日工时不足' + this.user.timeType.allday.toFixed(1) + '小时，是否确定提交?'
-                        }).then(()=>{
-                            this.submitReportSon()
-                        }).catch(()=>{})
-                    }else{
+                    // 验证通过
+                    if (this.isDraft == 1) {
+                        //暂存操作
                         this.submitReportSon()
+                    } else {
+                        //提交时，做工时时长不足的提醒
+                        if(this.totalReportHours < this.user.timeType.allday){
+                            this.$dialog.confirm({
+                                title: '提示',
+                                message: '当日工时不足' + this.user.timeType.allday.toFixed(1) + '小时，是否确定提交?'
+                            }).then(()=>{
+                                this.submitReportSon()
+                            }).catch(()=>{})
+                        }else{
+                            this.submitReportSon()
+                        }
                     }
                 }).catch(()=>{
                 //验证失败
@@ -1881,7 +1887,7 @@ import timetoolVue from '../timetool/timetool.vue';
                             return;
                         }
                     }
-                        if(this.user.timeType.notAllowedNoAttendance == 1){
+                        if(this.user.timeType.notAllowedNoAttendance == 1 && this.isDraft == 0){
                             if (this.report.time){
                                 if (this.report.time.workHours == 0){
                                     this.$toast.fail('无考勤记录不可填报')