From 8c15564b476b9abbfb1ca7fbf6b843e8af64accb Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期日, 25 六月 2023 17:28:47 +0800
Subject: [PATCH] 三一用户查询新增系统用户提交
---
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java | 5 +++++
ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java | 3 +++
ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml | 17 +++++++++++++++++
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java | 7 +++++++
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java | 6 +++++-
5 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java
index 526a75c..85bcd0c 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java
@@ -1,6 +1,7 @@
package com.ruoyi.sy.controller;
import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -45,10 +46,13 @@
*/
@PreAuthorize("@ss.hasPermi('sy:syUser:list')")
@GetMapping("/list")
+ @ApiOperation("鏌ヨ涓変竴杞﹁締鎸傛帴鐢ㄦ埛")
public TableDataInfo list(ArdSyUser ardSyUser)
{
startPage();
- List<ArdSyUser> list = ardSyUserService.selectArdSyUserList(ardSyUser);
+ /*List<ArdSyUser> list = ardSyUserService.selectArdSyUserList(ardSyUser);
+ return getDataTable(list);*/
+ List<Map<String,Object>> list = ardSyUserService.selectArdSyUserListWithSysUser(ardSyUser);
return getDataTable(list);
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java
index 0dccf6c..87488b6 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java
@@ -1,6 +1,8 @@
package com.ruoyi.sy.mapper;
import java.util.List;
+import java.util.Map;
+
import com.ruoyi.sy.domain.ArdSyUser;
/**
@@ -27,6 +29,9 @@
*/
public List<ArdSyUser> selectArdSyUserList(ArdSyUser ardSyUser);
+
+ public List<Map<String,Object>> selectArdSyUserListWithSysUser(ArdSyUser ardSyUser);
+
/**
* 鏂板涓変竴杞﹁締鐢ㄦ埛
*
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java b/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java
index f476f72..2973df3 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java
@@ -1,6 +1,8 @@
package com.ruoyi.sy.service;
import java.util.List;
+import java.util.Map;
+
import com.ruoyi.sy.domain.ArdSyUser;
/**
@@ -26,6 +28,7 @@
* @return 涓変竴杞﹁締鐢ㄦ埛闆嗗悎
*/
public List<ArdSyUser> selectArdSyUserList(ArdSyUser ardSyUser);
+ public List<Map<String,Object>> selectArdSyUserListWithSysUser(ArdSyUser ardSyUser);
/**
* 鏂板涓変竴杞﹁締鐢ㄦ埛
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java
index 852a384..f1f25dc 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.sy.service.impl;
import java.util.List;
+import java.util.Map;
import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +45,12 @@
return ardSyUserMapper.selectArdSyUserList(ardSyUser);
}
+
+ @Override
+ public List<Map<String,Object>> selectArdSyUserListWithSysUser(ArdSyUser ardSyUser) {
+ return ardSyUserMapper.selectArdSyUserListWithSysUser(ardSyUser);
+ }
+
/**
* 鏂板涓変竴杞﹁締鐢ㄦ埛
*
diff --git a/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
index ad9b0a6..75fab74 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
@@ -27,6 +27,23 @@
<if test="reserved2 != null and reserved2 != ''"> and reserved_2 = #{reserved2}</if>
</where>
</select>
+
+ <select id="selectArdSyUserListWithSysUser" parameterType="ArdSyUser" resultType="java.util.Map">
+ select su.user_name as "userName",coalesce(asu.id,'') as id,
+ coalesce(asu.sys_user_id,'') as "sysUserId",
+ coalesce(asu.user_id,'') as "userId",
+ coalesce(asu.password,'') as password,
+ coalesce(asu.reserved_1,'') as reserved1,
+ coalesce(asu.reserved_2,'') as reserved2 from ard_sy_user asu
+ right join sys_user su on asu.sys_user_id = su.user_id
+ <where>
+ <if test="sysUserId != null and sysUserId != ''"> and sys_user_id = #{sysUserId}</if>
+ <if test="userId != null and userId != ''"> and user_id = #{userId}</if>
+ <if test="password != null and password != ''"> and password = #{password}</if>
+ <if test="reserved1 != null and reserved1 != ''"> and reserved_1 = #{reserved1}</if>
+ <if test="reserved2 != null and reserved2 != ''"> and reserved_2 = #{reserved2}</if>
+ </where>
+ </select>
<select id="selectArdSyUserById" parameterType="String" resultMap="ArdSyUserResult">
<include refid="selectArdSyUserVo"/>
--
Gitblit v1.9.3