From 9c5068eb3d314009e628e1e9bbcc0a263f3d51b0 Mon Sep 17 00:00:00 2001
From: lzx <2602107437@qq.com>
Date: Sun, 29 Sep 2024 22:51:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=85=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/api/noticeapicontroller/LoginApiController.java   |  9 +++++++++
 .../java/org/jeecg/modules/apiservice/LoginApiService.java    |  4 ++++
 .../jeecg/modules/apiservice/impl/IndexApiServiceImpl.java    |  9 +++++----
 .../jeecg/modules/apiservice/impl/LoginApiServiceImpl.java    | 11 +++++++++++
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/LoginApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/LoginApiController.java
index 281e973..f2eaf62 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/LoginApiController.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/LoginApiController.java
@@ -55,4 +55,13 @@ public class LoginApiController {
     public Result<?> getPublishPostNotice(){
         return loginApiService.getPublishPostNotice();
     }
+
+
+
+    //获取配置信息
+    @ApiOperation(value="小程序-获取配置信息", notes="小程序-获取配置信息")
+    @GetMapping("/getConfig")
+    public Result<?> getConfig(){
+        return loginApiService.getConfig();
+    }
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/LoginApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/LoginApiService.java
index b9e1cb9..0bd94a6 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/LoginApiService.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/LoginApiService.java
@@ -17,4 +17,8 @@ public interface LoginApiService {
     //获取发布帖子发布需知
     Result<?> getPublishPostNotice();
 
+
+    //配置信息
+    Result<?> getConfig();
+
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java
index 0210ed8..1c2fdee 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java
@@ -100,13 +100,14 @@ public class IndexApiServiceImpl implements IndexApiService {
     //获取认证演员
     @Override
     public Result<?> getActorList(){
-        List<AtPerformer> list = performerService
+        List<AtActorCollection> list = atActorCollectionService
                 .lambdaQuery()
-                .orderByDesc(AtPerformer::getCreateTime)
+                .eq(AtActorCollection::getState,1)
+                .orderByDesc(AtActorCollection::getCreateTime)
                 .list();
         //创建一个新的集合
-        List<AtPerformer> newList = new ArrayList<>();
-        for (AtPerformer performer:list) {
+        List<AtActorCollection> newList = new ArrayList<>();
+        for (AtActorCollection performer:list) {
             performer.setUserId(hanHaiMemberService
                     .lambdaQuery()
                     .eq(HanHaiMember::getId,performer.getUserId()).one().getNickName());
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/LoginApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/LoginApiServiceImpl.java
index a8d9ab4..31e08e7 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/LoginApiServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/LoginApiServiceImpl.java
@@ -10,6 +10,7 @@ import org.jeecg.modules.service.AppletLoginService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Service
 public class LoginApiServiceImpl implements LoginApiService {
@@ -54,4 +55,14 @@ public class LoginApiServiceImpl implements LoginApiService {
         return Result.OK(user_tz.getContent());
     }
 
+
+
+
+    //配置信息
+    @Override
+    public Result<?> getConfig(){
+        List<HanHaiConf> list = hanHaiConfService.list();
+        return Result.OK(list);
+    }
+
 }