Просмотр исходного кода

修复手机端自行选择审核人模式下第二个项目无法选择审核人的BUG

seyason 2 лет назад
Родитель
Сommit
de780f6776

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserCorpwxTimeController.java

@@ -133,7 +133,7 @@ public class UserCorpwxTimeController {
             LocalDate localEnd = LocalDate.parse(endDate, standFormatter);
             if (participationList.size() > 0) {
                 List<Integer> collect = participationList.stream().map(Participation::getProjectId).collect(Collectors.toList());
-                List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().in("id", collect).eq("company_id", user.getCompanyId()).orderByAsc("id"));
+                List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().in("id", collect).eq("is_public", 0).eq("company_id", user.getCompanyId()).orderByAsc("id"));
 
                 names = projectList.stream().filter(p->{
                     if (p.getPlanStartDate() != null) {

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

@@ -807,7 +807,6 @@ public class TimingTask {
                     if(first.isPresent()){
                         bigDecimal=bigDecimal.add(new BigDecimal(String.valueOf(first.get().get("num"))));
                     }
-                    System.out.println("进来了-----------------------------------------------------------");
                     jsonObj.put("key", "待审核数量");
                     jsonObj.put("value",bigDecimal.toPlainString());
                     dataJson.add(jsonObj);

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -640,7 +640,7 @@ import timetoolVue from '../timetool/timetool.vue';
                     this.auditor.index = domainIndex
                     this.auditor.auditorIndex = auditorIndex
                     this.auditor.searchList.forEach(u=>{
-                        if(u.id == this.form.domains[domainIndex][auditorIndex].id){
+                        if(this.form.domains[domainIndex][auditorIndex] && u.id == this.form.domains[domainIndex][auditorIndex].id){
                             this.auditor.item = u
                         }
                     })