Merge branch 'dev' into test

@@ -117,10 +117,10 @@ func (srv ExcelDataService) BatchAddAttendance(operate domain.OperateInfo, param
 	}()
 	}()
 	//获取当前操作人
 	//获取当前操作人
 	userSrv := domainService.NewUserService()
 	userSrv := domainService.NewUserService()
-	operateUser, err := userSrv.User(operate.UserId)
-	if err != nil {
-		return nil, application.ThrowError(application.TRANSACTION_ERROR, "查询操作人数据失败。"+err.Error())
-	}
+	// operateUser, err := userSrv.User(operate.UserId)
+	// if err != nil {
+	// 	return nil, application.ThrowError(application.TRANSACTION_ERROR, "查询操作人数据失败。"+err.Error())
+	// }
 	//获取当前操作人的组织
 	//获取当前操作人的组织
 	var org *domain.Org
 	var org *domain.Org
 	org, err = userSrv.Organization(operate.OrgId)
 	org, err = userSrv.Organization(operate.OrgId)