Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper into master

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

@@ -922,8 +922,8 @@ public class ReportController {
             }
 
         }
-        for (Report report : reportList) {
-            if(comTimeType.getReportAuditType()==4){
+        if(comTimeType.getReportAuditType()==4){
+            for (Report report : reportList) {
                 Optional<Project> project = projectList.stream().filter(pl -> pl.getId().equals(report.getProjectId())).findFirst();
                 Optional<ProjectCategory> category = categoryList.stream().filter(cl -> cl.getId().equals(project.get().getCategory())).findFirst();
                 if(category.isPresent()){

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

@@ -1581,7 +1581,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().select("id,project_name,incharger_id,bu_id,category").in("id", assProjectIds));
                 List<ProjectCategory> categoryList = projectCategoryMapper.selectList(new QueryWrapper<ProjectCategory>().eq("company_id",company.getId()));
                 List<Integer> collect = projectList.stream().map(pl -> {
-                    if (!pl.getBuId().equals("")) {
+                    if (pl.getBuId()!=null&&!pl.getBuId().equals("")) {
                         String[] split = pl.getBuId().split(",");
                         return Integer.parseInt(split[split.length - 1]);
                     }
@@ -2574,7 +2574,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().select("id,project_name,incharger_id,bu_id,category").in("id", assProjectIds));
                 List<ProjectCategory> categoryList = projectCategoryMapper.selectList(new QueryWrapper<ProjectCategory>().eq("company_id",company.getId()));
                 List<Integer> collect = projectList.stream().map(pl -> {
-                    if (!pl.getBuId().equals("")) {
+                    if (pl.getBuId()!=null&&!pl.getBuId().equals("")) {
                         String[] split = pl.getBuId().split(",");
                         return Integer.parseInt(split[split.length - 1]);
                     }

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

@@ -618,11 +618,22 @@
             },
             // 获取周填报时间数据
             getDateRange(){
-                if(this.user.companyId == 817){
-                    this.weekIndex = 6
-                }else{
+                // if(this.user.companyId == 817){
+                //     this.weekIndex = 6
+                // }else{
+                //     this.weekIndex = 5
+                // }
+                if(this.user.timeType.alertNonWorkday) {
+                    if(this.user.timeType.alertNonWorkday == '110' || this.user.timeType.alertNonWorkday == '10') {
+                        this.weekIndex = 7
+                    }
+                    if(this.user.timeType.alertNonWorkday == '100') {
+                        this.weekIndex = 6
+                    }
+                } else {
                     this.weekIndex = 5
                 }
+
                 let nowDate = new Date()
                 let nowWeekday = nowDate.getDay()
                 let shuldDate
@@ -1979,9 +1990,6 @@
                 this.timeRange.push(i)
             }
             this.getDateRange()
-            // if(user.companyId == '817')
-            // console.log('userId',this.user.companyId);
-            // console.log(localStorage.getItem("formVal"))
             var ua = navigator.userAgent.toLowerCase();
             this.isIOSystem = this.isIOS();
             if (ua.indexOf("wxwork") > 0) {