From bdc56ebc9534620766d787a1dacb4c962ea10797 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Tue, 16 Jun 2020 10:36:35 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml | 190 ++++++++++++++++++++++++-----------------------
1 files changed, 96 insertions(+), 94 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml
index 428ed8a..6616183 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml
@@ -2,102 +2,104 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.kidgrow.usercenter.mapper.SysUserMapper">
- <sql id="where">
- <where>
- t.is_del=0
- <if test="u.id != null and u.id != ''">
- and t.id like concat('%', #{u.id}, '%')
- </if>
- <if test="u.username != null and u.username != ''">
- and t.username like concat('%', #{u.username}, '%')
- </if>
- <if test="u.nickname != null and u.nickname != ''">
- and t.nickname like concat('%', #{u.nickname}, '%')
- </if>
- <if test="u.enabled != null and u.enabled != ''">
- and t.enabled = #{u.enabled}
- </if>
- <if test="u.type != null and u.type != ''">
- and t.type = #{u.type}
- </if>
- <if test="u.searchKey != null and u.searchKey != '' and u.searchKey=='user_id'">
- and t.id like concat('%', #{u.searchValue}, '%')
- </if>
- <if test="u.searchKey != null and u.searchKey != '' and u.searchKey=='username'">
- and t.username like concat('%', #{u.searchValue}, '%')
- </if>
- <if test="u.searchKey != null and u.searchKey != '' and u.searchKey=='nick_name'">
- and t.nickname like concat('%', #{u.searchValue}, '%')
- </if>
- <if test="u.searchKey != null and u.searchKey != '' and u.searchKey=='mobile'">
- and t.mobile like concat('%', #{u.searchValue}, '%')
- </if>
- </where>
- </sql>
- <sql id="where_map">
- <where>
- <if test="u.id != null and u.id != ''">
- and t.id like concat('%', #{u.id}, '%')
- </if>
- <if test="u.username != null and u.username != ''">
- and t.username = #{u.username}
- </if>
- <if test="u.nickname != null and u.nickname != ''">
- and t.nickname like concat('%', #{u.nickname}, '%')
- </if>
- <if test="u.enabled != null and u.enabled != ''">
- and t.enabled = #{u.enabled}
- </if>
- <if test="u.type != null and u.type != ''">
- and t.type = #{u.type}
- </if>
- <if test="u.searchKey != null and u.searchKey != '' and u.searchKey=='user_id'">
- and t.id like concat('%', #{u.searchValue}, '%')
- </if>
- <if test="u.searchKey != null and u.searchKey != '' and u.searchKey=='username'">
- and t.username like concat('%', #{u.searchValue}, '%')
- </if>
- <if test="u.searchKey != null and u.searchKey != '' and u.searchKey=='nick_name'">
- and t.nickname like concat('%', #{u.searchValue}, '%')
- </if>
- <if test="u.searchKey != null and u.searchKey != '' and u.searchKey=='mobile'">
- and t.mobile like concat('%', #{u.searchValue}, '%')
- </if>
- </where>
- </sql>
+ <sql id="where">
+ <where>
+ t.is_del=0
+ <if test="u.id != null and u.id != ''">
+ and t.id like concat('%', #{u.id}, '%')
+ </if>
+ <if test="u.username != null and u.username != ''">
+ and t.username like concat('%', #{u.username}, '%')
+ </if>
+ <if test="u.nickname != null and u.nickname != ''">
+ and t.nickname like concat('%', #{u.nickname}, '%')
+ </if>
+ <if test="u.enabled != null and u.enabled != ''">
+ and t.enabled = #{u.enabled}
+ </if>
+ <if test="u.type != null and u.type != ''">
+ and t.type = #{u.type}
+ </if>
+ <if test="u.searchKey != null and u.searchKey != '' and u.searchKey=='user_id'">
+ and t.id like concat('%', #{u.searchValue}, '%')
+ </if>
+ <if test="u.searchKey != null and u.searchKey != '' and u.searchKey=='username'">
+ and t.username like concat('%', #{u.searchValue}, '%')
+ </if>
+ <if test="u.searchKey != null and u.searchKey != '' and u.searchKey=='nick_name'">
+ and t.nickname like concat('%', #{u.searchValue}, '%')
+ </if>
+ <if test="u.searchKey != null and u.searchKey != '' and u.searchKey=='mobile'">
+ and t.mobile like concat('%', #{u.searchValue}, '%')
+ </if>
+ </where>
+ </sql>
+ <sql id="where_map">
+ <where>
+ <if test="u.id != null and u.id != ''">
+ and t.id like concat('%', #{u.id}, '%')
+ </if>
+ <if test="u.username != null and u.username != ''">
+ and t.username = #{u.username}
+ </if>
+ <if test="u.nickname != null and u.nickname != ''">
+ and t.nickname like concat('%', #{u.nickname}, '%')
+ </if>
+ <if test="u.enabled != null and u.enabled != ''">
+ and t.enabled = #{u.enabled}
+ </if>
+ <if test="u.type != null and u.type != ''">
+ and t.type = #{u.type}
+ </if>
+ <if test="u.searchKey != null and u.searchKey != '' and u.searchKey=='user_id'">
+ and t.id like concat('%', #{u.searchValue}, '%')
+ </if>
+ <if test="u.searchKey != null and u.searchKey != '' and u.searchKey=='username'">
+ and t.username like concat('%', #{u.searchValue}, '%')
+ </if>
+ <if test="u.searchKey != null and u.searchKey != '' and u.searchKey=='nick_name'">
+ and t.nickname like concat('%', #{u.searchValue}, '%')
+ </if>
+ <if test="u.searchKey != null and u.searchKey != '' and u.searchKey=='mobile'">
+ and t.mobile like concat('%', #{u.searchValue}, '%')
+ </if>
+ </where>
+ </sql>
- <select id="findList" resultType="com.kidgrow.common.model.SysUser">
- select * from sys_user t
- <include refid="where" />
- order by t.id desc
- </select>
- <select id="selectCountByMap" parameterType="map" resultType="integer">
- select count(*) from sys_user t <include refid="where_map" />
- </select>
+ <select id="findList" resultType="com.kidgrow.common.model.SysUser">
+ select * from sys_user t
+ <include refid="where"/>
+ order by t.id desc
+ </select>
+ <select id="selectCountByMap" parameterType="map" resultType="integer">
+ select count(*) from sys_user t
+ <include refid="where_map"/>
+ </select>
- <select id="findAppointUsers" parameterType="integer" resultType="com.kidgrow.common.model.SysUser">
- SELECT
- USERS.id,
- USERS.nickname,
- USERS.mobile
- FROM
- `sys_role_user` RU
- LEFT JOIN sys_user USERS ON RU.user_id = USERS.id
- LEFT JOIN sys_role ROLE ON RU.role_id = ROLE.id
- WHERE
- USERS.is_del = 0
- <if test="type == 0">
- AND ROLE.`code` IN (
- 'salemanager',
- 'sale')
- </if>
- <if test="type == 1">
- AND ROLE.`code` IN (
- 'oprationmanager',
- 'opration')
- </if>
- </select>
- <select id="findDoctorUserAllData" resultType="com.kidgrow.common.model.DoctorUserAll">
+ <select id="findAppointUsers" parameterType="integer" resultType="com.kidgrow.common.model.SysUser">
+ SELECT
+ USERS.id,
+ USERS.nickname,
+ USERS.mobile
+ FROM
+ `sys_role_user` RU
+ LEFT JOIN sys_user USERS ON RU.user_id = USERS.id
+ LEFT JOIN sys_role ROLE ON RU.role_id = ROLE.id
+ WHERE
+ USERS.is_del = 0
+ <if test="type == 0">
+ AND ROLE.`code` IN (
+ 'salemanager',
+ 'sale')
+ </if>
+ <if test="type == 1">
+ AND ROLE.`code` IN (
+ 'oprationmanager',
+ 'opration')
+ </if>
+ </select>
+
+ <select id="findDoctorUserAllData" resultType="com.kidgrow.common.model.DoctorUserAll">
SELECT sysuser.id,
sysdoctor.doctor_name,
sysdoctor.doctor_ccie,
--
Gitblit v1.8.0