From 9d286e440036e54e10dbc94f8aa5e2fd204f1171 Mon Sep 17 00:00:00 2001
From: tamguo <tamguo@Lenovo>
Date: Thu, 26 Jul 2018 14:35:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/model/condition/SysUserCondition.java |  1 +
 .../modules/sys/web/SysUserController.java    |  1 -
 .../src/main/resources/application.properties |  2 +-
 .../main/resources/mappers/SysUserMapper.xml  | 35 ---------
 .../mappers/{ => sys}/SysAreaMapper.xml       |  0
 .../mappers/{ => sys}/SysCompanyMapper.xml    |  0
 .../mappers/{ => sys}/SysMenuMapper.xml       |  0
 .../mappers/{ => sys}/SysOfficeMapper.xml     |  0
 .../mappers/{ => sys}/SysPostMapper.xml       |  0
 .../{ => sys}/SysRoleDataScopeMapper.xml      |  0
 .../mappers/{ => sys}/SysRoleMapper.xml       |  0
 .../mappers/{ => sys}/SysRoleMenuMapper.xml   |  0
 .../resources/mappers/sys/SysUserMapper.xml   | 71 +++++++++++++++++++
 13 files changed, 73 insertions(+), 37 deletions(-)
 delete mode 100644 tamguo-oms/src/main/resources/mappers/SysUserMapper.xml
 rename tamguo-oms/src/main/resources/mappers/{ => sys}/SysAreaMapper.xml (100%)
 rename tamguo-oms/src/main/resources/mappers/{ => sys}/SysCompanyMapper.xml (100%)
 rename tamguo-oms/src/main/resources/mappers/{ => sys}/SysMenuMapper.xml (100%)
 rename tamguo-oms/src/main/resources/mappers/{ => sys}/SysOfficeMapper.xml (100%)
 rename tamguo-oms/src/main/resources/mappers/{ => sys}/SysPostMapper.xml (100%)
 rename tamguo-oms/src/main/resources/mappers/{ => sys}/SysRoleDataScopeMapper.xml (100%)
 rename tamguo-oms/src/main/resources/mappers/{ => sys}/SysRoleMapper.xml (100%)
 rename tamguo-oms/src/main/resources/mappers/{ => sys}/SysRoleMenuMapper.xml (100%)
 create mode 100644 tamguo-oms/src/main/resources/mappers/sys/SysUserMapper.xml

diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/condition/SysUserCondition.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/condition/SysUserCondition.java
index 9484dab..a31ada6 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/condition/SysUserCondition.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/condition/SysUserCondition.java
@@ -17,6 +17,7 @@ public class SysUserCondition {
 	private String companyName;
 	private String postCode;
 	private String status;
+	
 	public Integer getPageNo() {
 		return pageNo;
 	}
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java
index dd7d007..03331d1 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java
@@ -17,7 +17,6 @@ import com.tamguo.modules.sys.utils.Result;
 @RequestMapping(path="sys/user")
 public class SysUserController {
 	
-	
 	@Autowired
 	private ISysUserService iSysUserService;
 
diff --git a/tamguo-oms/src/main/resources/application.properties b/tamguo-oms/src/main/resources/application.properties
index 8899631..397b90c 100644
--- a/tamguo-oms/src/main/resources/application.properties
+++ b/tamguo-oms/src/main/resources/application.properties
@@ -24,7 +24,7 @@ spring.datasource.url=jdbc:mysql://47.100.175.14:3306/tamguo?useUnicode=true&cha
 spring.datasource.username=root
 spring.datasource.validationQuery=SELECT 1 FROM DUAL
 
-mybatis-plus.mapper-locations=classpath:/mappers/*Mapper.xml
+mybatis-plus.mapper-locations=classpath:/mappers/*/*Mapper.xml
 mybatis-plus.typeAliasesPackage=com.tamguo.modules.*.model
 mybatis-plus.typeEnumsPackage=com.tamguo.modules.*.model.enums
 mybatis-plus.global-config.id-type=5
diff --git a/tamguo-oms/src/main/resources/mappers/SysUserMapper.xml b/tamguo-oms/src/main/resources/mappers/SysUserMapper.xml
deleted file mode 100644
index 34dfc0b..0000000
--- a/tamguo-oms/src/main/resources/mappers/SysUserMapper.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.tamguo.modules.sys.dao.SysUserMapper">
-	
-	<select id="queryByLoginCode" resultType="SysUserEntity">
-		SELECT
-			u.*
-		FROM
-			sys_user u
-		WHERE
-			u.login_code = #{loginCode}
-  	</select>
-  	
-  	<select id="listData" resultType="SysUserEntity">
-		SELECT
-			u.user_code,
-			u.office_code,
-			u.office_name,
-			u.company_code,
-			u.company_name,
-			u.login_code,
-			u.user_name,
-			u.ref_name,
-			u.email,
-			u.mobile,
-			u.phone,
-			u.update_date,
-			u.`status`
-		FROM
-			sys_user u
-		WHERE
-			1 = 1
-  	</select>
-
-</mapper>
\ No newline at end of file
diff --git a/tamguo-oms/src/main/resources/mappers/SysAreaMapper.xml b/tamguo-oms/src/main/resources/mappers/sys/SysAreaMapper.xml
similarity index 100%
rename from tamguo-oms/src/main/resources/mappers/SysAreaMapper.xml
rename to tamguo-oms/src/main/resources/mappers/sys/SysAreaMapper.xml
diff --git a/tamguo-oms/src/main/resources/mappers/SysCompanyMapper.xml b/tamguo-oms/src/main/resources/mappers/sys/SysCompanyMapper.xml
similarity index 100%
rename from tamguo-oms/src/main/resources/mappers/SysCompanyMapper.xml
rename to tamguo-oms/src/main/resources/mappers/sys/SysCompanyMapper.xml
diff --git a/tamguo-oms/src/main/resources/mappers/SysMenuMapper.xml b/tamguo-oms/src/main/resources/mappers/sys/SysMenuMapper.xml
similarity index 100%
rename from tamguo-oms/src/main/resources/mappers/SysMenuMapper.xml
rename to tamguo-oms/src/main/resources/mappers/sys/SysMenuMapper.xml
diff --git a/tamguo-oms/src/main/resources/mappers/SysOfficeMapper.xml b/tamguo-oms/src/main/resources/mappers/sys/SysOfficeMapper.xml
similarity index 100%
rename from tamguo-oms/src/main/resources/mappers/SysOfficeMapper.xml
rename to tamguo-oms/src/main/resources/mappers/sys/SysOfficeMapper.xml
diff --git a/tamguo-oms/src/main/resources/mappers/SysPostMapper.xml b/tamguo-oms/src/main/resources/mappers/sys/SysPostMapper.xml
similarity index 100%
rename from tamguo-oms/src/main/resources/mappers/SysPostMapper.xml
rename to tamguo-oms/src/main/resources/mappers/sys/SysPostMapper.xml
diff --git a/tamguo-oms/src/main/resources/mappers/SysRoleDataScopeMapper.xml b/tamguo-oms/src/main/resources/mappers/sys/SysRoleDataScopeMapper.xml
similarity index 100%
rename from tamguo-oms/src/main/resources/mappers/SysRoleDataScopeMapper.xml
rename to tamguo-oms/src/main/resources/mappers/sys/SysRoleDataScopeMapper.xml
diff --git a/tamguo-oms/src/main/resources/mappers/SysRoleMapper.xml b/tamguo-oms/src/main/resources/mappers/sys/SysRoleMapper.xml
similarity index 100%
rename from tamguo-oms/src/main/resources/mappers/SysRoleMapper.xml
rename to tamguo-oms/src/main/resources/mappers/sys/SysRoleMapper.xml
diff --git a/tamguo-oms/src/main/resources/mappers/SysRoleMenuMapper.xml b/tamguo-oms/src/main/resources/mappers/sys/SysRoleMenuMapper.xml
similarity index 100%
rename from tamguo-oms/src/main/resources/mappers/SysRoleMenuMapper.xml
rename to tamguo-oms/src/main/resources/mappers/sys/SysRoleMenuMapper.xml
diff --git a/tamguo-oms/src/main/resources/mappers/sys/SysUserMapper.xml b/tamguo-oms/src/main/resources/mappers/sys/SysUserMapper.xml
new file mode 100644
index 0000000..4128d52
--- /dev/null
+++ b/tamguo-oms/src/main/resources/mappers/sys/SysUserMapper.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tamguo.modules.sys.dao.SysUserMapper">
+	
+	<select id="queryByLoginCode" resultType="SysUserEntity">
+		SELECT
+			u.*
+		FROM
+			sys_user u
+		WHERE
+			u.login_code = #{loginCode}
+  	</select>
+  	
+  	<select id="listData" resultType="SysUserEntity">
+		SELECT
+			u.user_code,
+			u.office_code,
+			u.office_name,
+			u.company_code,
+			u.company_name,
+			u.login_code,
+			u.user_name,
+			u.ref_name,
+			u.email,
+			u.mobile,
+			u.phone,
+			u.update_date,
+			u.`status`
+		FROM
+			sys_user u
+		WHERE
+			1 = 1
+		<if test="loginCode != null and loginCode != ''">
+			and u.login_code = #{loginCode}
+		</if>
+		<if test="userName != null and userName != ''">
+			and u.user_name = #{userName}
+		</if>
+		<if test="email != null and email != ''">
+			and u.email = #{email}
+		</if>
+		<if test="mobile != null and mobile != ''">
+			and u.mobile = #{mobile}
+		</if>
+		<if test="phone != null and phone != ''">
+			and u.phone = #{phone}
+		</if>
+		<if test="refName != null and refName != ''">
+			and u.ref_name = #{refName}
+		</if>
+		<if test="officeName != null and officeName != ''">
+			and u.office_name = #{officeName}
+		</if>
+		<if test="officeCode != null and officeCode != ''">
+			and u.office_code = #{officeCode}
+		</if>
+		<if test="companyCode != null and companyCode != ''">
+			and u.company_code = #{companyCode}
+		</if>
+		<if test="companyName != null and companyName != ''">
+			and u.company_name = #{companyName}
+		</if>
+		<if test="postCode != null and postCode != ''">
+			and u.post_code = #{postCode}
+		</if>
+		<if test="status != null and status != ''">
+			and u.status = #{status}
+		</if>
+  	</select>
+
+</mapper>
\ No newline at end of file