From 372cc31846c4a058e7ae443ebae4b0a706747728 Mon Sep 17 00:00:00 2001
From: wuyibo <771227828@qq.com>
Date: Wed, 12 Jul 2023 09:31:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysUserController.java  |  2 +
 .../resources/mapper/system/WxUserMapper.xml  |  2 +-
 ruoyi-ui/src/api/system/WxBuilding.js         |  8 +--
 ruoyi-ui/src/api/system/competition.js        |  2 +-
 .../src/views/system/competition/index.vue    |  6 +-
 ruoyi-ui/src/views/system/wxUser/index.vue    | 72 ++++++++++---------
 6 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index b7b400de..de6409ec 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -127,6 +127,8 @@ public class SysUserController extends BaseController
         LoginUser sysUserVo = new LoginUser();
         sysUserVo.setSysUser(sysUser);
         sysUserVo.setRoles(roles);
+        sysUserVo.setUserid(sysUser.getUserId());
+        sysUserVo.setUsername(sysUser.getUserName());
         sysUserVo.setPermissions(permissions);
         return R.ok(sysUserVo);
     }
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml
index 5822ee0b..1c02a08c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWxUserVo">
-        select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, LOGIN_NAME, PASS_WORD, ROLE, OPENID, AVATAR, GENDER, USER_NAME, TELEPHONE, BIRTHDAY, HEIGHT, WEIGHT, TEAM_POSITION, TAG, ENABLED, UNIONID, OFFICIAL_ACCOUNT_OPENID, real_name from user_info
+        select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, LOGIN_NAME, PASS_WORD, ROLE, OPENID, AVATAR, GENDER, USER_NAME, TELEPHONE, BIRTHDAY, HEIGHT, WEIGHT, TEAM_POSITION, TAG, ENABLED, UNIONID, OFFICIAL_ACCOUNT_OPENID,REAL_NAME from user_info
     </sql>
 
     <select id="selectWxUserList" parameterType="WxUser" resultMap="WxUserResult">
diff --git a/ruoyi-ui/src/api/system/WxBuilding.js b/ruoyi-ui/src/api/system/WxBuilding.js
index 2eb3ff1d..fed698e6 100644
--- a/ruoyi-ui/src/api/system/WxBuilding.js
+++ b/ruoyi-ui/src/api/system/WxBuilding.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询球场管理列表
 export function listWxBuilding(query) {
   return request({
-    url: '/system/WxBuilding/list',
+    url: '/system/wxBuildingInfo/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listWxBuilding(query) {
 // 查询球场管理详细
 export function getWxBuilding(id) {
   return request({
-    url: '/system/WxBuilding/' + id,
+    url: '/system/wxBuildingInfo/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getWxBuilding(id) {
 // 新增球场管理
 export function addWxBuilding(data) {
   return request({
-    url: '/system/WxBuilding',
+    url: '/system/wxBuildingInfo',
     method: 'post',
     data: data
   })
@@ -36,7 +36,7 @@ export function batchUploadFiles(data,url) {
 // 修改球场管理
 export function updateWxBuilding(data) {
   return request({
-    url: '/system/WxBuilding',
+    url: '/system/wxBuildingInfo',
     method: 'put',
     data: data
   })
diff --git a/ruoyi-ui/src/api/system/competition.js b/ruoyi-ui/src/api/system/competition.js
index b6132330..2c479ac2 100644
--- a/ruoyi-ui/src/api/system/competition.js
+++ b/ruoyi-ui/src/api/system/competition.js
@@ -12,7 +12,7 @@ export function listCompetition(query) {
 // 查询比赛信息详细
 export function getCompetition(id) {
   return request({
-    url: '/system/competition/' + id,
+    url: '/system/competition/getInfo/' + id,
     method: 'get'
   })
 }
diff --git a/ruoyi-ui/src/views/system/competition/index.vue b/ruoyi-ui/src/views/system/competition/index.vue
index dc774f52..f4cfb5fe 100644
--- a/ruoyi-ui/src/views/system/competition/index.vue
+++ b/ruoyi-ui/src/views/system/competition/index.vue
@@ -196,13 +196,13 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:competition:edit']"
           >修改</el-button>
-          <el-button
+<!--          <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:competition:remove']"
-          >删除</el-button>
+          >删除</el-button>-->
           <el-button
             size="mini"
             type="text"
@@ -226,7 +226,7 @@
     <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="比赛名称" prop="competitionName" >
-          <el-input v-model="form.competitionName" disabled />
+          <el-input v-model="form.competitionName" />
         </el-form-item>
         <el-form-item label="比赛球场" prop="buildingName">
           <el-select v-model="form.buildingName" filterable @change="changeBuildName" remote reserve-keyword
diff --git a/ruoyi-ui/src/views/system/wxUser/index.vue b/ruoyi-ui/src/views/system/wxUser/index.vue
index 877199a0..7e4c322d 100644
--- a/ruoyi-ui/src/views/system/wxUser/index.vue
+++ b/ruoyi-ui/src/views/system/wxUser/index.vue
@@ -9,6 +9,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="真实姓名" prop="realName">
+        <el-input
+          v-model="queryParams.realName"
+          placeholder="请输入真实姓名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="用户名称" prop="userName">
         <el-input
           v-model="queryParams.userName"
@@ -24,7 +32,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -34,6 +42,18 @@
           v-hasPermi="['system:wxUser:add']"
         >新增</el-button>
       </el-col>
+       <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:wxUser:remove']"
+        >删除</el-button>
+      </el-col>
+      -->
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -45,17 +65,6 @@
           v-hasPermi="['system:wxUser:edit']"
         >修改</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:wxUser:remove']"
-        >删除</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -87,8 +96,9 @@
         </template>
       </el-table-column>
       <el-table-column label="用户名称" align="center" prop="userName" />
-      <el-table-column label="手机号" align="center" prop="telephone" />
-      <el-table-column label="生日" align="center" prop="birthday" width="180">
+      <el-table-column label="真实姓名" align="center" prop="realName" />
+      <el-table-column label="手机号" align="center" prop="telephone" width="180"/>
+      <el-table-column label="生日" align="center" prop="birthday" width="150">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
         </template>
@@ -118,13 +128,13 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:wxUser:edit']"
           >修改</el-button>
-          <el-button
+<!--          <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:wxUser:remove']"
-          >删除</el-button>
+          >删除</el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -138,9 +148,9 @@
     />
 
     <!-- 添加或修改微信用户对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="删除表示" prop="isDeleted">
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="180px">
+<!--        <el-form-item label="删除表示" prop="isDeleted">
           <el-input v-model="form.isDeleted" placeholder="请输入删除表示" />
         </el-form-item>
         <el-form-item label="创建时间" prop="createdTime">
@@ -153,18 +163,7 @@
         </el-form-item>
         <el-form-item label="创建人" prop="createdBy">
           <el-input v-model="form.createdBy" placeholder="请输入创建人" />
-        </el-form-item>
-        <el-form-item label="修改人" prop="modifiedBy">
-          <el-input v-model="form.modifiedBy" placeholder="请输入修改人" />
-        </el-form-item>
-        <el-form-item label="最新更新时间" prop="lastUpdatedTime">
-          <el-date-picker clearable
-                          v-model="form.lastUpdatedTime"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择最新更新时间">
-          </el-date-picker>
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="登录名称" prop="loginName">
           <el-input v-model="form.loginName" placeholder="请输入登录名称" />
         </el-form-item>
@@ -183,6 +182,9 @@
         <el-form-item label="用户名称" prop="userName">
           <el-input v-model="form.userName" placeholder="请输入用户名称" />
         </el-form-item>
+        <el-form-item label="真实姓名" prop="realName">
+          <el-input v-model="form.realName" placeholder="请输入真实姓名" />
+        </el-form-item>
         <el-form-item label="手机号" prop="telephone">
           <el-input v-model="form.telephone" placeholder="请输入手机号" />
         </el-form-item>
@@ -200,11 +202,11 @@
         <el-form-item label="体重" prop="weight">
           <el-input v-model="form.weight" placeholder="请输入体重" />
         </el-form-item>
-        <el-form-item label="球队位置【字典】" prop="teamPosition">
-          <el-input v-model="form.teamPosition" placeholder="请输入球队位置【字典】" />
+        <el-form-item label="球队位置" prop="teamPosition">
+          <el-input v-model="form.teamPosition" placeholder="请输入球队位置" />
         </el-form-item>
-        <el-form-item label="标签【字典】" prop="tag">
-          <el-input v-model="form.tag" placeholder="请输入标签【字典】" />
+        <el-form-item label="标签" prop="tag">
+          <el-input v-model="form.tag" placeholder="请输入标签" />
         </el-form-item>
         <el-form-item label="状态" prop="enabled">
           <el-input v-model="form.enabled" placeholder="请输入状态" />