开机奖励逻辑

AppStart/Helper/StatService.cs

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