From 268a86dc9146b450721e4c0e4dbbe0daa03ee9c6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 12 Mar 2021 17:32:19 +0800
Subject: [PATCH] 校验用户信息，用户增删改查
---
screen-api/src/main/resources/mapper/UserMapper.xml | 59 ++++++++++++++++++++++++-----------------------------------
1 files changed, 24 insertions(+), 35 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/UserMapper.xml b/screen-api/src/main/resources/mapper/UserMapper.xml
index 14cd3a9..bcbc3fb 100644
--- a/screen-api/src/main/resources/mapper/UserMapper.xml
+++ b/screen-api/src/main/resources/mapper/UserMapper.xml
@@ -2,41 +2,30 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.moral.api.mapper.UserMapper">
- <!-- ������������������������ -->
- <resultMap id="BaseResultMap" type="com.moral.api.entity.User">
- <id column="id" property="id" />
- <result column="is_admin" property="isAdmin" />
- <result column="account" property="account" />
- <result column="password" property="password" />
- <result column="user_name" property="userName" />
- <result column="organization_id" property="organizationId" />
- <result column="email" property="email" />
- <result column="mobile" property="mobile" />
- <result column="wechat" property="wechat" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="expire_time" property="expireTime" />
- <result column="is_delete" property="isDelete" />
- </resultMap>
+ <!-- ������������������������ -->
+ <resultMap id="BaseResultMap" type="com.moral.api.entity.User">
+ <id column="id" property="id"/>
+ <result column="is_admin" property="isAdmin"/>
+ <result column="account" property="account"/>
+ <result column="password" property="password"/>
+ <result column="user_name" property="userName"/>
+ <result column="organization_id" property="organizationId"/>
+ <result column="email" property="email"/>
+ <result column="mobile" property="mobile"/>
+ <result column="wechat" property="wechat"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="expire_time" property="expireTime"/>
+ <result column="is_delete" property="isDelete"/>
+ </resultMap>
- <select id="selectUserGroup" resultType="com.moral.api.entity.Group">
- SELECT g.*
- FROM `group` g,`user_group` ug
- WHERE ug.user_id = #{userId}
- AND ug.group_id = g.id
- AND g.is_delete = 0
- AND ug.is_delete = 0
- </select>
-
- <select id="selectUserMenu" resultType="com.moral.api.entity.Menu">
- SELECT DISTINCT m.*
- FROM `user_group` ug,`group_menu` gm,`menu` m
- WHERE ug.user_id = #{userId}
- and ug.group_id = gm.group_id
- and gm.menu_id = m.id
- and ug.is_delete = 0
- and gm.is_delete = 0
- and m.is_delete = 0
- ORDER by m.`order`
+ <select id="selectUsers" resultType="java.util.Map">
+ SELECT id,account,user_name userName,email,mobile,wechat FROM `user` WHERE
+ <if test="orgId!=null">
+ organization_id = #{orgId}
+ </if>
+ <if test="userId!=null">
+ id = #{userId}
+ </if>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0