diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDayReportBean.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDayReportBean.java
index 11234ee..51f911c 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDayReportBean.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDayReportBean.java
@@ -87,7 +87,7 @@ public class AttDayReportBean {
 
     public AttDayReportBean(String attCurrentDay, Long normalNum, Long lateNum,
                             Long earlyNum, Long skippingNum, Long leaveNum, Long addressErrorNum,
-                            Long einErrorNum, Long restNum, Long outNum) {
+                            Long einErrorNum, Long restNum, Long outNum, Long outCount) {
         this.attCurrentDay = attCurrentDay;
         this.addressErrorNum = addressErrorNum;
         this.earlyNum = earlyNum;
@@ -98,5 +98,6 @@ public class AttDayReportBean {
         this.outNum = outNum;
         this.restNum = restNum;
         this.skippingNum = skippingNum;
+        this.outCount = outCount;
     }
 }
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttendanceDetailsServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttendanceDetailsServiceImpl.java
index 13d96cf..9e0433c 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttendanceDetailsServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttendanceDetailsServiceImpl.java
@@ -114,9 +114,10 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
         //只能查自己分公司的人
         SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
         List<String> roleId = sysUser.getRoleList();
-        if (Collections.frequency(roleId, 1L)==0) {
+        if(roleId !=null && !roleId.isEmpty() ){
+        if (Collections.frequency(roleId, "1")==0) {
             List<MapVo> orgList = SecurityUtils.getLoginUser().getSysUser().getOrgList();
-            if(!orgList.isEmpty()){
+            if (!orgList.isEmpty()) {
                 ArrayList<String> ids = new ArrayList<>();
                 for (MapVo mapVo : orgList) {
                     ids.add(String.valueOf(mapVo.getId()));
@@ -124,6 +125,7 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
                 bean.setOrgList(ids);
             }
         }
+        }
         return attendanceDetailsDao.selectAttUpdateList(bean);
     }
 
@@ -207,7 +209,7 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
                         AttDayReportBean::getAttCurrentDay,
                         obj -> new AttDayReportBean(obj.getAttCurrentDay(), obj.getNormalNum(), obj.getLateNum(),
                                 obj.getEarlyNum(), obj.getSkippingNum(), obj.getLeaveNum(), obj.getAddressErrorNum(),
-                                obj.getEinErrorNum(), obj.getRestNum(), obj.getOutNum()),
+                                obj.getEinErrorNum(), obj.getRestNum(), obj.getOutNum(), obj.getOutCount()),
                         (existing, replacement) -> new AttDayReportBean(
                                 existing.getAttCurrentDay(),
                                 existing.getNormalNum() + replacement.getNormalNum(),
@@ -218,7 +220,8 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
                                 existing.getAddressErrorNum() + replacement.getAddressErrorNum(),
                                 existing.getEinErrorNum() + replacement.getEinErrorNum(),
                                 existing.getRestNum() + replacement.getRestNum(),
-                                existing.getOutNum() + replacement.getOutNum()
+                                existing.getOutNum() + replacement.getOutNum(),
+                                existing.getOutCount() + replacement.getOutCount()
                         )
                 ));
         map.forEach((k, v) -> {
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java
index 78283f9..cc8e2b5 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java
@@ -60,7 +60,7 @@ public class AttTasks {
     private volatile boolean executed = false; // 标志位，表示任务是否已经执行过
 
     //    @Scheduled(cron = "0 0/10 * * * ?")
-    @Scheduled(initialDelay = 6000, fixedDelay = 60000 * 10)
+//    @Scheduled(initialDelay = 6000, fixedDelay = 60000 * 10)
     @Async
     public void getAttTasks() {
         log.info("--------考勤定时器开启------");
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/WechatTasks.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/WechatTasks.java
index fbade91..e73eb08 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/WechatTasks.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/WechatTasks.java
@@ -77,7 +77,7 @@ public class WechatTasks {
      * 人员基础数据同步定时器
      */
     //    @Scheduled(cron = "0 0/10 * * * ?")
-//    @Scheduled(initialDelay = 6000,fixedDelay = 60000 * 10)
+    @Scheduled(initialDelay = 6000,fixedDelay = 60000 * 10)
     @Async
     public void pushPersonTask() {
         log.info("--------人员基础数据同步定时器开启------");
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/utils/IpAndPathConfig.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/utils/IpAndPathConfig.java
index 5983aa3..1afc7e5 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/utils/IpAndPathConfig.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/utils/IpAndPathConfig.java
@@ -14,12 +14,12 @@ public class IpAndPathConfig {
      */
 //    @Value("${environment}")
 //    public static String environment;
-    public static String environment = "test";
+    public static String environment = "location";
 
     /**
      * 小程序相关
      */
-    public static String wechatDevUrl = "http://127.0.0.1:1907/gz_att_wechat";
+    public static String wechatDevUrl = "http://127.0.0.1:21907/gz_att_wechat";
 
     public static String wechatTestUrl = "http://192.168.0.14:1907/gz_att_wechat";
 
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysOrgServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysOrgServiceImpl.java
index b9fdb7b..e4adcf0 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysOrgServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysOrgServiceImpl.java
@@ -67,7 +67,7 @@ public class SysOrgServiceImpl implements SysOrgService {
         List<String> roleId = sysUser.getRoleList();
         //管理员与人资角色可以看到所有
         if( roleId !=null && !roleId.isEmpty()){
-            if (Collections.frequency(roleId, 1L)==0 && Collections.frequency(roleId, 16L)==0) {
+            if (Collections.frequency(roleId, "1")==0 && Collections.frequency(roleId, "16")==0) {
                 List<MapVo> orgList = sysUser.getOrgList();
                 if (!orgList.isEmpty()) {
                     ArrayList<String> ids = new ArrayList<>();
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/dept/service/ProDeptRoleServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/dept/service/ProDeptRoleServiceImpl.java
index 2b541b8..613855e 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/dept/service/ProDeptRoleServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/dept/service/ProDeptRoleServiceImpl.java
@@ -43,7 +43,8 @@ public class ProDeptRoleServiceImpl implements ProDeptRoleService {
         //只能查自己分公司的人
         SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
         List<String> roleId = sysUser.getRoleList();
-        if (Collections.frequency(roleId, 1L)==0) {
+        if(roleId !=null && !roleId.isEmpty() ){
+        if (Collections.frequency(roleId, "1")==0) {
             List<MapVo> orgList = sysUser.getOrgList();
             if (!orgList.isEmpty()) {
                 ArrayList<String> ids = new ArrayList<>();
@@ -52,7 +53,7 @@ public class ProDeptRoleServiceImpl implements ProDeptRoleService {
                 }
                 bean.setOrgList(ids);
             }
-
+        }
         }
         return proDeptRoleDao.getRoleUserList(bean);
     }
@@ -61,7 +62,8 @@ public class ProDeptRoleServiceImpl implements ProDeptRoleService {
         //只能查自己分公司的人
         SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
         List<String> roleId = sysUser.getRoleList();
-        if (Collections.frequency(roleId, 1L) == 0) {
+        if(roleId !=null && !roleId.isEmpty() ){
+        if (Collections.frequency(roleId, "1") == 0) {
             List<MapVo> orgList = sysUser.getOrgList();
             if (!orgList.isEmpty()) {
                 ArrayList<String> ids = new ArrayList<>();
@@ -75,6 +77,7 @@ public class ProDeptRoleServiceImpl implements ProDeptRoleService {
                 bean.setOrgList(ids);
             }
         }
+        }
         return proDeptRoleDao.getRoleUserNoManagerList(bean);
     }
 
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/dept/service/SubOrgServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/dept/service/SubOrgServiceImpl.java
index 230372c..d55cba6 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/dept/service/SubOrgServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/dept/service/SubOrgServiceImpl.java
@@ -53,14 +53,16 @@ public class SubOrgServiceImpl implements SubOrgService {
         //只能查自己分公司的人
         SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
         List<String> roleId = sysUser.getRoleList();
-        if (Collections.frequency(roleId, 1L)==0) {
-            List<MapVo> orgList = SecurityUtils.getLoginUser().getSysUser().getOrgList();
-            if (!orgList.isEmpty()) {
-                ArrayList<String> ids = new ArrayList<>();
-                for (MapVo mapVo : orgList) {
-                    ids.add(String.valueOf(mapVo.getId()));
+        if(roleId !=null && !roleId.isEmpty() ) {
+            if (Collections.frequency(roleId, "1") == 0) {
+                List<MapVo> orgList = SecurityUtils.getLoginUser().getSysUser().getOrgList();
+                if (!orgList.isEmpty()) {
+                    ArrayList<String> ids = new ArrayList<>();
+                    for (MapVo mapVo : orgList) {
+                        ids.add(String.valueOf(mapVo.getId()));
+                    }
+                    subOrgBean.setOrgList(ids);
                 }
-                subOrgBean.setOrgList(ids);
             }
         }
         return orgDao.selectOrgList(subOrgBean);
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/HolidayServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/HolidayServiceImpl.java
index 61d30f9..39dab19 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/HolidayServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/HolidayServiceImpl.java
@@ -65,7 +65,7 @@ public class HolidayServiceImpl implements HolidayService {
         SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
         List<String> roleId = sysUser.getRoleList();
         if(roleId !=null && !roleId.isEmpty() ){
-            if (Collections.frequency(roleId, 1L)==0) {
+            if (Collections.frequency(roleId, "1")==0) {
                 List<MapVo> orgList = SecurityUtils.getLoginUser().getSysUser().getOrgList();
                 if (!orgList.isEmpty()) {
                     ArrayList<String> ids = new ArrayList<>();