From b133f1b2b0c0a2a9835c944eb3c6085d43f9c680 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Tue, 27 Jun 2023 20:44:00 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90sys=E3=80=91?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E5=BA=94=E7=94=A8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AF=B9=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E5=92=8C=E5=A4=87=E6=B3=A8=E7=9A=84=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/service/impl/SysAppServiceImpl.java       |  4 +++-
 .../sys/modular/login/pojo/IndexUserAppInfo.java  | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/app/service/impl/SysAppServiceImpl.java b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/app/service/impl/SysAppServiceImpl.java
index f9bbc987d..ea78d617e 100644
--- a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/app/service/impl/SysAppServiceImpl.java
+++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/app/service/impl/SysAppServiceImpl.java
@@ -137,7 +137,7 @@ public class SysAppServiceImpl extends ServiceImpl<SysAppMapper, SysApp> impleme
 
         LambdaQueryWrapper<SysApp> sysAppLambdaQueryWrapper = new LambdaQueryWrapper<>();
         sysAppLambdaQueryWrapper.in(SysApp::getAppId, appIds);
-        sysAppLambdaQueryWrapper.select(SysApp::getAppId, SysApp::getAppName);
+        sysAppLambdaQueryWrapper.select(SysApp::getAppId, SysApp::getAppName, SysApp::getAppIcon, SysApp::getRemark);
         sysAppLambdaQueryWrapper.orderByAsc(SysApp::getAppSort);
 
         List<SysApp> sysAppList = this.list(sysAppLambdaQueryWrapper);
@@ -148,6 +148,8 @@ public class SysAppServiceImpl extends ServiceImpl<SysAppMapper, SysApp> impleme
             IndexUserAppInfo indexUserAppInfo = new IndexUserAppInfo();
             indexUserAppInfo.setAppId(sysApp.getAppId());
             indexUserAppInfo.setAppName(sysApp.getAppName());
+            indexUserAppInfo.setAppIcon(sysApp.getAppIcon());
+            indexUserAppInfo.setRemark(sysApp.getRemark());
             indexUserAppInfo.setCurrentSelectFlag(false);
             indexUserAppInfos.add(indexUserAppInfo);
         }
diff --git a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserAppInfo.java b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserAppInfo.java
index 17ec688d2..f6b94759a 100644
--- a/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserAppInfo.java
+++ b/kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/pojo/IndexUserAppInfo.java
@@ -1,6 +1,8 @@
 package cn.stylefeng.roses.kernel.sys.modular.login.pojo;
 
+import cn.stylefeng.roses.kernel.file.api.format.FileUrlFormatProcess;
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
+import cn.stylefeng.roses.kernel.rule.annotation.SimpleFieldFormat;
 import lombok.Data;
 
 import java.util.List;
@@ -27,6 +29,19 @@ public class IndexUserAppInfo {
     @ChineseDescription("应用名称")
     private String appName;
 
+    /**
+     * 应用图标的文件id
+     */
+    @ChineseDescription("应用图标的文件id")
+    @SimpleFieldFormat(processClass = FileUrlFormatProcess.class)
+    private Long appIcon;
+
+    /**
+     * 应用描述
+     */
+    @ChineseDescription("应用描述")
+    private String remark;
+
     /**
      * 应用菜单集合
      */