修改提示语

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

@@ -451,11 +451,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                     expenseSheet.setOwnerId(first.get().getId());
                     expenseSheet.setOwnerName(first.get().getName());
                 } else {
-                    if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                        throw new Exception("报销人/工号[" +reimburserCell+"]不存在");
-                    }else {
-                        throw new Exception("报销人[" +reimburserCell+"]不存在");
-                    }
+                    throw new Exception("报销人[" +reimburserCell+"]不存在");
                 }
                 expenseSheet.setOperatorId(user.getId());
                 expenseSheet.setRemark(remarksCell.getStringCellValue());

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

@@ -3310,8 +3310,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                 project.setInchargerName(first.get().getName());
                             } else {
                                 switch (exception){
-                                    case 0:throw new Exception(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1?"项目负责人工号为["+split[0]+"]的人员不存在":"项目负责人姓名/工号为["+split[0]+"]的人员不存在");
-                                    case 1:throw new Exception("项目负责人["+split[0]+"]姓名与工号不匹配");
+                                    case 0:throw new Exception("["+split[0]+"]在系统中不存在");
+                                    case 1:throw new Exception("["+split[0]+"]在系统中不存在");
                                 }
                             }
                         }
@@ -3414,8 +3414,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             participationList.add(p);
                         } else {
                             switch (exception){
-                                case 0:throw new Exception(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1?"参与人工号为["+split[0]+"]的人员不存在":"参与人姓名/工号为["+split[0]+"]的人员不存在");
-                                case 1:throw new Exception("参与人["+split[0]+"]姓名与工号不匹配");
+                                case 0:throw new Exception("["+split[0]+"]在系统中不存在");
+                                case 1:throw new Exception("["+split[0]+"]在系统中不存在");
                             }
                         }
                     }
@@ -3463,8 +3463,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                     }
                                 } else {
                                     switch (exception){
-                                        case 0:throw new Exception(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1?"参与人工号为["+split[0]+"]的人员不存在":"参与人姓名/工号为["+split[0]+"]的人员不存在");
-                                        case 1:throw new Exception("参与人["+split[0]+"]姓名与工号不匹配");
+                                        case 0:throw new Exception("["+split[0]+"]在系统中不存在");
+                                        case 1:throw new Exception("["+split[0]+"]在系统中不存在");
                                     }
                                 }
                             }
@@ -3880,8 +3880,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                 project.setInchargerName(first.get().getName());
                             } else {
                                 switch (exception){
-                                    case 0:throw new Exception((wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1)?"项目负责人工号为["+split[0]+"]的人员不存在":"项目负责人姓名/工号为["+split[0]+"]的人员不存在");
-                                    case 1:throw new Exception("项目负责人["+split[0]+"]姓名与工号不匹配");
+                                    case 0:throw new Exception("["+split[0]+"]在系统中不存在");
+                                    case 1:throw new Exception("["+split[0]+"]在系统中不存在");
                                 }
                             }
                         }
@@ -4464,8 +4464,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             participationList.add(p);
                         } else {
                             switch (exception){
-                                case 0:throw new Exception(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1?"参与人工号为["+split[0]+"]的人员不存在":"参与人姓名/工号为["+split[0]+"]的人员不存在");
-                                case 1:throw new Exception("参与人["+split[0]+"]姓名与工号不匹配");
+                                case 0:throw new Exception("["+split[0]+"]在系统中不存在");
+                                case 1:throw new Exception("["+split[0]+"]在系统中不存在");
                             }
                         }
                     }
@@ -4513,8 +4513,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                     }
                                 } else {
                                     switch (exception){
-                                        case 0:throw new Exception(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1?"参与人工号为["+split[0]+"]的人员不存在":"参与人姓名/工号为["+split[0]+"]的人员不存在");
-                                        case 1:throw new Exception("参与人["+split[0]+"]姓名与工号不匹配");
+                                        case 0:throw new Exception("["+split[0]+"]在系统中不存在");
+                                        case 1:throw new Exception("["+split[0]+"]在系统中不存在");
                                     }
                                 }
                             }

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

@@ -3621,11 +3621,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     }
                     if (!any.isPresent()) {
                         //msg.setError("人员["+username+"]不存在，请先在组织结构中添加或者通过钉钉同步导入");
-                        if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                            msg.setError(MessageUtils.message("staff.peopleNullAndAddPlus",username));
-                        }else {
-                            msg.setError(MessageUtils.message("staff.peopleNullAndAdd",username));
-                        }
+                        msg.setError(MessageUtils.message("staff.peopleNullAndAdd",username));
                         return msg;
                     }
                     User reportCreator = any.get();

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/DockWithMLD.java

@@ -79,7 +79,7 @@ public class DockWithMLD {
         //分页参数 处理全部数据 不需要进行分页
         JSONObject pageInfo = new JSONObject();
         pageInfo.put("pageNo", 1);
-        pageInfo.put("pageSize",1000);
+        pageInfo.put("pageSize",10000);
         paramDatajson.put("pageInfo",pageInfo);
         //封装 mainTable 参数
         JSONObject mainTable  = JSON.parseObject(screenString);

fhKeeper/formulahousekeeper/management-platform/src/main/resources/i18n/messages.properties

@@ -350,7 +350,6 @@ role.deleteErrorByHavePeople=该角色存在相关人员，请将他们修改为
 #员工相关
 staff.nameNullByRow=第{0}行缺少员工姓名
 staff.peopleNullAndAdd=人员[{0}]不存在，请先在组织结构中添加或者通过钉钉同步导入
-staff.peopleNullAndAddPlus=人员/工号[{0}]不存在，请先在组织结构中添加或者通过钉钉同步导入
 staff.proportionError=人员[{0}]分摊比例不满足100%,当前比例[{1}%],请检查
 staff.workingHoursNull=工号为{0}的员工在工时系统中不存在
 staff.deleteErrorByDaily=该员工存在填写的日报，无法删除。

fhKeeper/formulahousekeeper/management-platform/src/main/resources/i18n/messages_en_US.properties

@@ -350,7 +350,6 @@ role.deleteErrorByHavePeople=There are related persons in this role. Please modi
 #员工相关
 staff.nameNullByRow=Employee name is missing in row {0}.
 staff.peopleNullAndAdd=The person [{0}] does not exist. Please add it in the organization structure first or import it synchronously through Ding Talk.
-staff.peopleNullAndAddPlus=The person/jobNumber [{0}] does not exist. Please add it in the organization structure first or import it synchronously through Ding Talk.
 staff.proportionError=The personnel [{0}] + allocation proportion does not meet 100%. The current proportion [{1}%], please check.
 staff.workingHoursNull=The employee with job number {0} does not exist in the work hour system.
 staff.deleteErrorByDaily=The employee has daily reports filled in and cannot be deleted.