From 1ec94c00e5c312818c9e1e3742ca838e60b7e5e7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 20 十月 2025 17:15:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysEducationalInfoController.java |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysEducationalInfoController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysEducationalInfoController.java
index 926d98c..aa364e4 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysEducationalInfoController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysEducationalInfoController.java
@@ -7,6 +7,7 @@
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.model.TSysActivity;
 import com.ruoyi.system.model.TSysEducationalInfo;
 import com.ruoyi.system.query.TSysEducationalInfoQuery;
 import com.ruoyi.system.service.TSysEducationalInfoService;
@@ -44,12 +45,8 @@
      */
     @ApiOperation(value = "获取教育资讯分页列表")
     @PostMapping(value = "/pageList")
-    public R<PageInfo<TSysEducationalInfo>> pageList(@RequestBody TSysEducationalInfoQuery query) {
-        Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
-        if(roleType == 5){
-            query.setRoleType(roleType);
-        }
-        return R.ok(sysEducationalInfoService.pageList(query));
+    public R<PageInfo<TSysEducationalInfo>> pageListApp(@RequestBody TSysEducationalInfoQuery query) {
+        return R.ok(sysEducationalInfoService.pageListApp(query));
     }
 
     /**
@@ -67,7 +64,14 @@
     @ApiOperation(value = "查看教育资讯详情")
     @GetMapping(value = "/getDetailById")
     public R<TSysEducationalInfo> getDetailById(@RequestParam String id) {
-        return R.ok(sysEducationalInfoService.getById(id));
+        TSysEducationalInfo sysEducationalInfo = sysEducationalInfoService.getById(id);
+        // 查询次数自增 使用数据库原子更新操作
+        sysEducationalInfoService.update(
+                Wrappers.<TSysEducationalInfo>lambdaUpdate()
+                        .setSql("click_count = click_count + 1")
+                        .eq(TSysEducationalInfo::getId, id)
+        );
+        return R.ok(sysEducationalInfo);
     }
 
 }

--
Gitblit v1.7.1