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

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

@@ -12,10 +12,7 @@ import com.management.platform.entity.*;
 import com.management.platform.entity.vo.DdLeaveQtVo;
 import com.management.platform.entity.vo.SysRichFunction;
 import com.management.platform.mapper.*;
-import com.management.platform.service.CompanyDingdingService;
-import com.management.platform.service.DingDingService;
-import com.management.platform.service.ExcelExportService;
-import com.management.platform.service.UserYearleaveSettingService;
+import com.management.platform.service.*;
 import com.management.platform.service.impl.ProjectServiceImpl;
 import com.management.platform.util.HttpRespMsg;
 import com.management.platform.util.ListUtil;
@@ -69,6 +66,8 @@ public class UserYearleaveSettingController {
     private SysFunctionMapper sysFunctionMapper;
     @Resource
     private WxCorpInfoMapper wxCorpInfoMapper;
+    @Resource
+    private DepartmentService departmentService;
 
     @Value(value = "${upload.path}")
     private String path;
@@ -213,18 +212,6 @@ public class UserYearleaveSettingController {
         }
     }
 
-    //递归获取企业微信所有上级部门字符串，格式："上级部门/上级部门/部门"
-    private String getWxDepartment(Department department) {
-        String depHierarchy = "$departmentName="+department.getCorpwxDeptid()+"$";
-        //搜到父部门进行添加
-        if (department.getCorpwxDeptpid()==null || department.getCorpwxDeptpid()==1) {
-            return depHierarchy;
-        }else{
-            Department supDep = departmentMapper.selectOne(new QueryWrapper<Department>().eq("corpwx_deptid",department.getCorpwxDeptpid()).eq("company_id",department.getCompanyId()));
-            return getWxDepartment(supDep) + "/" + depHierarchy;
-        }
-    }
-
     //导出剩余假期
     @RequestMapping("/exportDingDingLeaveQt")
     public HttpRespMsg exportDingDingLeaveQt(DdLeaveQtVo ddLeaveQtVo){
@@ -241,7 +228,7 @@ public class UserYearleaveSettingController {
         List<User> user = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId));
         List<HashMap<String,Object>> deptMap = new ArrayList<>();
         for (Department department : deptName) {
-            department.setDepartmentName(getSupDepartment(department));
+            department.setDepartmentName(departmentService.getSupDepartment(department,deptName));
             for (User userItem : user) {
                 if (userItem.getDepartmentId().equals(department.getDepartmentId())){
                     HashMap<String, Object> mapItem = new HashMap<>();

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

@@ -3952,7 +3952,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看全公司工时");
             //获取部门的所有子部门
             List<Department> departments = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id",companyId));
-            List<Integer> branchDepartment = departmentService.getBranchDepartment(departmentId,departments);
+            List<Integer> branchDepartment = departments.stream().map((d) -> d.getDepartmentId()).collect(Collectors.toList());
+            if(departmentId != null){
+                branchDepartment = departmentService.getBranchDepartment(departmentId,departments);
+            }
             if (functionList.size() == 0) {
                 //检查是否是部门负责人
                 List<Integer> allVisibleDeptIdList = getAllVisibleDeptIdList(user, null);

fhKeeper/formulahousekeeper/timesheet/src/views/expense/expense.vue

@@ -1369,7 +1369,7 @@ export default {
         //首先判断文件类型
         let str = item.file.name.split(".");
         let format = str[str.length - 1];
-        if (format != "jpg" && format != "png") {
+        if (format != "jpg" && format != "png" && format != "pdf") {
             this.$message({
                 message: this.$t('pleaseselectpictures'),
                 type: "error"
@@ -1418,7 +1418,7 @@ export default {
         //首先判断文件类型
         let str = item.file.name.split(".");
         let format = str[str.length - 1];
-        if (format != "jpg" && format != "png") {
+        if (format != "jpg" && format != "png" && format != "pdf") {
             this.$message({
                 message: this.$t('pleaseselectpictures'),
                 type: "error"

fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

@@ -1771,7 +1771,6 @@ export default {
         });
     },
     billss() {
-      this.page = 1
       var param = {pageIndex: this.page,
                     pageSize: this.size,
                     status: this.code,
@@ -1974,6 +1973,7 @@ export default {
         this.addForm.timeHours = parseInt(this.addForm.timeHours)
     },
     handleSizeChange(val){
+      this.page = 1
       this.size = val;
       this.bills()
     },