Merge remote-tracking branch 'origin/main'

bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java

@@ -142,7 +142,7 @@ public class AttTasks {
      */
     private void pushAttData(String pushDate, int pushType) {
         //获取黔送云的考勤数据
-//        getQsyAttendanceData(pushDate, pushType);
+        getQsyAttendanceData(pushDate, pushType);
         //获取考勤机中的考勤数据
         getMachineAttendanceData(pushDate, pushType);
 //        //查出每一个考勤组的应出勤天数以及考勤组的规则

bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java

@@ -360,6 +360,11 @@ public class SysUserController extends BaseController {
     public AjaxResult checkPersonAssignment(@RequestBody SysUser bean) {
         try{
             wechatTasks.checkWechatIsFace(bean);
+            if(!"1".equals(bean.getIsCheck())){
+                //没通过重新授权一下
+                bean.setIsFace("1");
+                wechatTasks.updateWechatIsFace(bean);
+            }
             return toAjax(userService.checkPersonAssignment(bean));
         }catch (Exception e){
             logger.error(e.toString(),e);