添加自定义数据设置

app/v1/logic/dataReport/ChannelAnalysisLogic.php

@@ -40,6 +40,7 @@ class ChannelAnalysisLogic extends BaseLogic
         // 外层包裹分页、排序
         $finalSql = " SELECT {$field} FROM ( {$unionSql} ) AS all_hour GROUP BY {$group} ";
 
+
         // 按小时数据
         $hourData = Db::connect('db_data_report')->query($finalSql);
 
@@ -125,7 +126,6 @@ class ChannelAnalysisLogic extends BaseLogic
         // 按照每日，获取=>注册数据
         $regData = Db::connect('db_data_report')->query("SELECT tdate, SUM(reg_total) reg_total FROM ( {$unionBaseTotalDaySql} ) AS all_base_total_day  GROUP BY tdate order by tdate ");
 
-
        
         // 2. 活跃数据：$actData = 按照日期，获取每日的 活跃数 SUM(【active_total】) 活跃天数 【days】, 分组 【reg_date,days】，game_active_day_2025
         $gameActiveDaySqlParts = [];
@@ -136,9 +136,19 @@ class ChannelAnalysisLogic extends BaseLogic
 
         $unionGameActiveDaySql = implode(" UNION ALL ", $gameActiveDaySqlParts);
 
+
+
+        echo $unionGameActiveDaySql;
+
+
+
         $actDataSql = "select reg_date as tdate, days, sum(active_total) as active from ({$unionGameActiveDaySql}) as all_game_active_day group by reg_date,days";
         // 替换日期字段, 因为game_active_day_表的日期字段是[reg_date]
-        $actDataSql = str_replace("tdate", "reg_date", $actDataSql);
+        // $actDataSql = str_replace("tdate", "reg_date", $actDataSql);
+
+        // echo $actDataSql;
+
+
         // 日期、活跃天数、活跃数，按日期和活跃天数分组
         $actData = Db::connect('db_data_report')->query($actDataSql);
 

plugin/saiadmin/app/controller/system/SystemUserController.php

@@ -53,6 +53,7 @@ class SystemUserController extends BaseController
             'sa_system_user.id' => 'id',
             'sa_system_user.nickname' => 'nickname', 
             'sa_system_user.username' => 'username', 
+            'sa_system_user.data_permission' => 'data_permission',
             'sa_system_user.phone' => 'phone', 
             'sa_system_user.email' => 'email', 
             'sa_system_user.status' => 'status', 
@@ -196,22 +197,10 @@ class SystemUserController extends BaseController
      */
     public function setUserPermission(Request $request) : Response
     {
-        $id = $request->post('id');
-        $game_list = $request->post('game_list');
-        $normal_game_list = $request->post('normal_game_list');
-        $ad_permission = $request->post('ad_permission');
-        $data = [];
-        if ($game_list) {
-            $data['game_list'] = $game_list;
-        }
-        if ($normal_game_list) {
-            $data['normal_game_list'] = $normal_game_list;
-        }
-        if($ad_permission!==null){
-            $data['ad_permission'] = $ad_permission;
-        }      
-        
-        $this->logic->authEdit($id, $data);
+        $params = $request->post();
+        $id = $params['id'];
+        unset($params['id']);
+        $this->logic->authEdit($id, $params);
         $userInfoCache = new UserInfoCache($id);
         $userInfoCache->clearUserInfo();
         $userAuthCache = new UserAuthCache($id);

plugin/saiadmin/app/logic/system/SystemDeptLogic.php

@@ -189,9 +189,7 @@ class SystemDeptLogic extends BaseLogic
     public function setGameListByDeptId($dept_id, $game_list)
     {
         $result = $this->model->where('id', $dept_id)->update(['game_list' => $game_list]);
-        if (!$result) {
-            throw new ApiException('更新部门游戏权限失败');
-        }
+
         return $result;
     }
 

plugin/saiadmin/basic/BaseLogic.php

@@ -380,6 +380,7 @@ class BaseLogic
             }
         }
 
+
         // 看指定游戏的自然量
         $authNormalGameList = $userInfo['normal_game_list']; // 可看自然量的游戏
         if ($authNormalGameList != '*' && $authNormalGameList != '-1' && !empty($data['game_id'])) {