From 9c6decb5276d7a1faf82b0b67976339ff8142206 Mon Sep 17 00:00:00 2001
From: liyihao <1054753886@qq.com>
Date: Sun, 12 Dec 2021 19:29:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E7=AE=A1=E7=90=86=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/data/entity/DataApp.java   | 10 ++++++++++
 .../main/resources/mapper/data/DataAppMapper.xml   | 14 ++++++++++----
 ruoyi-ui/src/views/data/app/index.vue              |  8 ++------
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/mobile-app/src/main/java/com/ruoyi/data/entity/DataApp.java b/mobile-app/src/main/java/com/ruoyi/data/entity/DataApp.java
index f920799..fc7b22d 100644
--- a/mobile-app/src/main/java/com/ruoyi/data/entity/DataApp.java
+++ b/mobile-app/src/main/java/com/ruoyi/data/entity/DataApp.java
@@ -13,6 +13,8 @@ public class DataApp extends BaseEntity {
 
     //主键
     private Long id;
+    //用户名称
+    private String nickName;
     //应用id（一个用户一个唯一的）
     private Long appId;
     //应用名称
@@ -98,4 +100,12 @@ public class DataApp extends BaseEntity {
     public void setStatus(int status) {
         this.status = status;
     }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
 }
diff --git a/mobile-app/src/main/resources/mapper/data/DataAppMapper.xml b/mobile-app/src/main/resources/mapper/data/DataAppMapper.xml
index a380079..5f14b33 100755
--- a/mobile-app/src/main/resources/mapper/data/DataAppMapper.xml
+++ b/mobile-app/src/main/resources/mapper/data/DataAppMapper.xml
@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
         <result property="status"    column="status"    />
+        <result property="nickName"    column="nick_name"    />
     </resultMap>
 
 
@@ -31,13 +32,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectAppList" parameterType="com.ruoyi.data.entity.DataApp" resultMap="DataAppResult">
 
-        select  * from data_app
+        select
+        a.* , u.nick_name
+        from
+        data_app a  LEFT JOIN sys_user u
+        on a.user_id = u.user_id
+
         <where>
             <if test="appName != null and appName != ''">
-                and app_name = #{appName}
+                and a.app_name = #{appName}
             </if>
-            <if test="appId != null and appId != ''" >and app_id = #{appId}</if>
-            <if test="userId != null and userId != ''">and user_id = #{userId}</if>
+            <if test="appId != null and appId != ''" >and a.app_id = #{appId}</if>
+            <if test="userId != null and userId != ''">and a.user_id = #{userId}</if>
         </where>
 
     </select>
diff --git a/ruoyi-ui/src/views/data/app/index.vue b/ruoyi-ui/src/views/data/app/index.vue
index f0aa717..23ac56f 100644
--- a/ruoyi-ui/src/views/data/app/index.vue
+++ b/ruoyi-ui/src/views/data/app/index.vue
@@ -60,9 +60,9 @@
         <el-table v-loading="loading" :data="appList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="编号" align="center" key="appId" prop="appId"  width="50"/>
-          <el-table-column label="应用名称" align="center" key="appName" prop="appName" />
+          <el-table-column label="应用名称" align="center" key="appName" prop="appName" width="230" />
+          <el-table-column label="用户名称" align="center" key="nickName" prop="nickName" width="90"/>
           <el-table-column label="简介" align="center" key="text" prop="text" />
-          <!--<el-table-column label="url" align="center" key="url" prop="url" />-->
           <el-table-column label="我的key值" align="center" key="appKey" prop="appKey" />
           <el-table-column label="创建时间" align="center" prop="createTime"  width="160">
             <template slot-scope="scope">
@@ -250,13 +250,9 @@
       },
       /** 新增按钮操作 */
       handleAdd() {
-        if(this.appList.length >= 1){
-          this.$modal.msgSuccess("只能申请一次");
-        }else {
           this.reset();
           this.open = true;
           this.title = "申请应用";
-        }
       },
       /** 修改按钮操作 */
       handleUpdate(row) {
-- 
Gitee