组织架构中 同步企微通讯录 新增【可见范围设置】按钮 修改

登录获取企业管理员列表 修改

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

@@ -218,5 +218,15 @@ public class UserController {
         return userService.importMonthCost(file, ymonth, request);
     }
 
+    @RequestMapping("/isManager")
+    public HttpRespMsg isManager(HttpServletRequest request) throws Exception {
+        return userService.isManager(request);
+    }
+
+    @RequestMapping("/skipGuidance")
+    public HttpRespMsg skipGuidance(HttpServletRequest request){
+        return userService.skipGuidance(request);
+    }
+
 }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/vo/UserVO.java

@@ -26,6 +26,4 @@ public class UserVO extends User {
 
     private boolean hasAuditDept;
 
-    private boolean isManager;
-
 }

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

@@ -75,4 +75,8 @@ public interface UserService extends IService<User> {
     HttpRespMsg loginAdminByThirdParty(String jobNumber, String token);
 
     HttpRespMsg importMonthCost(MultipartFile file, String ymonth, HttpServletRequest request);
+
+    HttpRespMsg isManager(HttpServletRequest request) throws Exception;
+
+    HttpRespMsg skipGuidance(HttpServletRequest request);
 }

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

@@ -199,13 +199,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     }
                 }
             }
-            //获取所在企业管理员列表
-            List<User> adminList=new ArrayList<>();
-            try {
-                adminList = wxCorpInfoService.getAdminList(company.getId());
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
             //检测密码正确时
             UserVO userVO = new UserVO().setCompanyName(company.getCompanyName());
             userVO.setCompany(company);
@@ -234,14 +227,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 num = auditWorkflowTimeSettingMapper.selectCount(new QueryWrapper<AuditWorkflowTimeSetting>().in("audit_dept_id", deptIds));
             }
             userVO.setHasAuditDept(num>0);
-            boolean match = adminList.stream().anyMatch(al -> al.getCorpwxUserid().equals(userVO.getCorpwxUserid()));
-            userVO.setManager(match);
             //获取当前角色的权限菜单
             setUserRoleMenu(userVO);
             httpRespMsg.data = userVO;
-            //记录第一次登录
-            userList.get(0).setIsFirstLogin(0);
-            userMapper.updateById(userList.get(0));
         } else {
             httpRespMsg.setError(MessageUtils.message("user.pwdError"));
         }
@@ -451,6 +439,28 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         return msg;
     }
 
+    @Override
+    public HttpRespMsg isManager(HttpServletRequest request) throws Exception {
+        HttpRespMsg msg=new HttpRespMsg();
+        User user= userMapper.selectById(request.getHeader("token"));
+        List<User> adminList = wxCorpInfoService.getAdminList(user.getCompanyId());
+        boolean match = adminList.stream().anyMatch(al -> user.getCorpwxUserid() != null && al.getCorpwxUserid() != null && al.getCorpwxUserid().equals(user.getCorpwxUserid()));
+        msg.data=match;
+        return msg;
+    }
+
+    @Override
+    public HttpRespMsg skipGuidance(HttpServletRequest request) {
+        HttpRespMsg msg=new HttpRespMsg();
+        User user= userMapper.selectById(request.getHeader("token"));
+        user.setIsFirstLogin(0);
+        if(userMapper.updateById(user)>0){
+            return msg;
+        }
+        msg.setError("验证失败");
+        return msg;
+    }
+
 
     public void setUserRoleMenu(UserVO user) {
         Integer roleId = user.getRoleId();
@@ -2339,13 +2349,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         if (info != null) {
             user.setUserNameNeedTranslate(info.getSaasSyncContact());
         }
-        //获取所在企业管理员列表
-        List<User> adminList=new ArrayList<>();
-        try {
-            adminList = wxCorpInfoService.getAdminList(company.getId());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
 
         UserVO userVO = new UserVO().setCompanyName(company.getCompanyName());
         userVO.setCompany(company);
@@ -2365,14 +2368,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             num = auditWorkflowTimeSettingMapper.selectCount(new QueryWrapper<AuditWorkflowTimeSetting>().in("audit_dept_id", deptIds));
         }
         userVO.setHasAuditDept(num>0);
-        boolean match = adminList.stream().anyMatch(al -> al.getCorpwxUserid().equals(userVO.getCorpwxUserid()));
-        userVO.setManager(match);
         //获取当前角色的权限菜单
         setUserRoleMenu(userVO);
         httpRespMsg.data = userVO;
-        //记录第一次登录
-        user.setIsFirstLogin(0);
-        userMapper.updateById(user);
         return httpRespMsg;
     }
 

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

@@ -295,15 +295,15 @@ public class TimingTask {
             DateTimeFormatter dtf1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
             DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("HH:mm");
             //需要修改************************************************  日期
-            LocalDateTime yesterday = LocalDateTime.now().minusDays(100);
+            LocalDateTime yesterday = LocalDateTime.now().minusDays(2);
             String startDate = dtf.format(yesterday);
             String endDate = dtf.format(yesterday.plusDays(30));
             List<UserFvTime> oldUserFvTimeList = userFvTimeService.list(new QueryWrapper<UserFvTime>().eq("company_id", compId));
             List<LeaveSheet> oldLeaveSheetList = leaveSheetService.list(new QueryWrapper<LeaveSheet>().eq("company_id", compId));
             List<BusinessTrip> oldBusinessTripList = businessTripService.list(new QueryWrapper<BusinessTrip>().eq("company_id", compId));
             /*jsonObject.put("startDate",startDate);
-            jsonObject.put("endDate",endDate);
-            jsonObject.put("workDate",startDate);*/
+            jsonObject.put("endDate",endDate);*/
+            jsonObject.put("workDate",startDate);
             String jsonString = jsonObject.toJSONString();
             List<UserFvTime> userFvTimeList=new ArrayList<>();
             List<LeaveSheet> leaveSheetList=new ArrayList<>();
@@ -323,7 +323,7 @@ public class TimingTask {
             List<Map<String,Object>> replaceWorkDataList= (List<Map<String, Object>>) replaceWorkDataMsg.data;
             List<String> userIds = workDataList.stream().map(map -> String.valueOf(map.get("userId"))).distinct().collect(Collectors.toList());
             List<User> userList = userMapper.selectList(new QueryWrapper<User>().in("job_number", userIds));
-            List<LocalDateTime> dateTimeList = getDays(yesterday, yesterday.plusDays(132));
+            List<LocalDateTime> dateTimeList = getDays(yesterday, yesterday.plusDays(2));
             for (User user : userList) {
                 for (LocalDateTime localDateTime : dateTimeList) {
                     LocalDate workDate=localDateTime.toLocalDate();
@@ -384,6 +384,9 @@ public class TimingTask {
                         if(first.isPresent()){
                             userFvTime.setId(first.get().getId());
                         }
+                        if(endTime.isBefore(startTime)){
+                            continue;
+                        }
                         userFvTimeList.add(userFvTime);
                     }
                 }