Merge remote-tracking branch 'origin/master'

# Conflicts:
#	attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStaffStatServiceImpl.java

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java

 package com.mortals.xhx.module.dept.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.mortals.framework.common.Rest;
 import com.mortals.xhx.common.code.EnableEnum;
 import com.mortals.xhx.common.code.EnabledEnum;
@@ -308,6 +309,7 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
         Rest<OrgDataInfo> orgRest = hikPersonService.getOrgList(orgListReq);
         if (orgRest.getCode() == YesNoEnum.YES.getValue()) {
             List<OrgInfo> orgInfoList = orgRest.getData().getList();
+            log.info("orgInfoList:{}", JSON.toJSONString(orgInfoList));
             for (OrgInfo orgInfo : orgInfoList) {
                 //查询数据库信息
                 DeptEntity deptEntity = this.selectOne(new DeptQuery().deptCode(orgInfo.getOrgIndexCode()));
@@ -344,8 +346,6 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
     @Override
     public Rest<String> syncDeptByDevice(Context context) {
         //todo
-
-
         return Rest.ok();
     }