From 9103dfb8f667ec24e1ee8a2c81cc726fef20c3d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Tue, 31 Aug 2021 10:02:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=94=A8=E6=88=B7=E7=BB=84?=
=?UTF-8?q?=E6=8F=90=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mesnac/meapi/controller/UserGroupController.java | 4 ++--
.../foreverwin/mesnac/meapi/mapper/UserGroupMapper.java | 2 +-
meapi/src/main/resources/mapper/UserGroupMapper.xml | 7 ++++---
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/UserGroupController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/UserGroupController.java
index 43921e13..e754ce38 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/UserGroupController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/UserGroupController.java
@@ -124,8 +124,8 @@ public class UserGroupController {
@ResponseBody
- @PostMapping("/findAbnormalUserGroup")
- public R findAbnormalUserGroup(@RequestBody Map<String,Object> param){
+ @GetMapping("/findAbnormalUserGroup")
+ public R findAbnormalUserGroup(@RequestParam(required = false) Map<String,Object> param){
try{
return R.ok(userGroupService.findAbnormalUserGroup(param));
}catch (Exception e){
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java
index 2003170d..e1fc320d 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java
@@ -34,6 +34,6 @@ public interface UserGroupMapper extends BaseMapper<UserGroup> {
List<UserGroup> findUserGroupListByUser(@Param("site")String site,@Param("user")String user);
- List<UserGroup> findAbnormalUserGroup(@Param("site")String site, @Param("param")Map<String,Object> map);
+ List<UserGroup> findAbnormalUserGroup(@Param("site")String site, @Param("param")Map<String,Object> param);
}
\ No newline at end of file
diff --git a/meapi/src/main/resources/mapper/UserGroupMapper.xml b/meapi/src/main/resources/mapper/UserGroupMapper.xml
index 4bd1b9e0..ec64be23 100644
--- a/meapi/src/main/resources/mapper/UserGroupMapper.xml
+++ b/meapi/src/main/resources/mapper/UserGroupMapper.xml
@@ -391,12 +391,13 @@
</select>
<select id="findAbnormalUserGroup" resultMap="BaseResultMap">
- SELECT <include refid="Base_Column_List"></include>
+ SELECT ug.USER_GROUP USER_GROUP,ug.DESCRIPTION DESCRIPTION
FROM USER_GROUP ug
- INNER JOIN CUSTOM_FIELDS cf ON cf.HANDLE = ug.HANDLE AND cf."ATTRIBUTE" = 'TYPE'
+ INNER JOIN CUSTOM_FIELDS cf ON cf.HANDLE = ug.HANDLE AND cf."ATTRIBUTE" = 'USER_GROUP_TYPE'
<where>
+ ug.SITE = #{site}
<if test="param.type != null and param.type != ''">
- cf.VALUE LIKE '%${param.type}%'
+ AND cf.VALUE = #{param.type}
</if>
</where>
</select>