|
|
@@ -1226,13 +1226,13 @@ namespace MySystem
|
|
|
if(puser.UserType > 0 || puser.LeaderLevel > 0)
|
|
|
{
|
|
|
bool leaderOp = true;
|
|
|
- if(puser.LeaderLevel > 0 && puser.UserType == 0)
|
|
|
+ if(puser.LeaderLevel > 0)
|
|
|
{
|
|
|
DateTime now = DateTime.Now;
|
|
|
leaderOp = db.Leaders.Any(m => m.Id == puser.Id && m.ExpiredDate >= now);
|
|
|
function.WriteLog("条件:leaderOp:" + leaderOp, "开机奖励发放日志");
|
|
|
}
|
|
|
- else if(puser.LeaderLevel == 0 && puser.UserType > 0)
|
|
|
+ if(puser.UserType > 0 && !leaderOp)
|
|
|
{
|
|
|
DateTime now = DateTime.Now;
|
|
|
leaderOp = opdb.SysAdmin.Any(m => m.UserId == puser.Id && m.ExpireDate >= now);
|