From f0376f72170c2eb236bec5560b8c5734edd222f1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 31 Mar 2021 17:16:40 +0800
Subject: [PATCH] common模块： 增加了convert工具类，驼峰和下划线相互转换 更新了Date工具类，添加根据Date，day获取目标date的方法 更新WebUtils工具类，添加获取请求Ip方法 manage模块： 组织和后台用户增删改查模块全部完成 增加aop用作日志插入
---
screen-api/src/main/resources/mapper/UserMapper.xml | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/UserMapper.xml b/screen-api/src/main/resources/mapper/UserMapper.xml
index c0a28ef..532a523 100644
--- a/screen-api/src/main/resources/mapper/UserMapper.xml
+++ b/screen-api/src/main/resources/mapper/UserMapper.xml
@@ -19,7 +19,7 @@
<result column="is_delete" property="isDelete"/>
</resultMap>
- <resultMap id="userInfoMap" type="com.moral.api.pojo.UserBo" extends="BaseResultMap">
+ <resultMap id="userInfoMap" type="com.moral.api.pojo.UserBO" extends="BaseResultMap">
<!--������������-->
<association property="organization" javaType="com.moral.api.entity.Organization">
<result column="id" property="id" jdbcType="INTEGER"/>
@@ -47,13 +47,4 @@
WHERE u.account = #{account}
</select>
- <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