Merge remote-tracking branch 'origin/master'

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -64,6 +64,10 @@ public class SysUser extends BaseEntity
     /** 用户类型（00系统用户）(11微信用户) */
     private String userType;
 
+    /** 用户系统(1仓储、2车队、3凯和) */
+    @Excel(name = "用户系统(1仓储经理、2仓储操作员、10车队经理、11车队操作员)")
+    private String userSystem;
+
     /** 微信唯一Id */
     private String openId;
 

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -13,12 +13,13 @@
 		<result property="phonenumber"  column="phonenumber"  />
 		<result property="sex"          column="sex"          />
 		<result property="avatar"       column="avatar"       />
+		<result property="userSystem"    column="user_system" />
 		<result property="password"     column="password"     />
 		<result property="userType"     column="user_type"    />
 		<result property="openId"     	column="open_id"      />
 		<result property="imgSrc"     	column="img_src"      />
 		<result property="sessionKey" 	column="session_key"  />
-		<result property="relatedNo" 	column="related_no"  />
+		<result property="relatedNo" 	column="related_no"   />
 		<result property="status"       column="status"       />
 		<result property="delFlag"      column="del_flag"     />
 		<result property="loginIp"      column="login_ip"     />
@@ -51,7 +52,7 @@
 	</resultMap>
 
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.user_type, u.open_id, u.img_src, u.session_key,
+        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.user_type, u.user_system, u.open_id, u.img_src, u.session_key,
          u.related_no, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
         d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
@@ -62,7 +63,7 @@
     </sql>
 
 	<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.user_type, u.open_id, u.img_src, u.session_key, u.related_no, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.user_type, u.user_system, u.open_id, u.img_src, u.session_key, u.related_no, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		<if test="userName != null and userName != ''">
@@ -74,6 +75,9 @@
 		<if test="userType != null and userType != ''">
 			AND u.user_type = #{userType}
 		</if>
+		<if test="userType != null and userType != ''">
+			AND u.user_system = #{userSystem}
+		</if>
 		<if test="openId != null and openId != ''">
 			AND u.open_id = #{openId}
 		</if>
@@ -110,11 +114,11 @@
 	</select>
 
 	<select id="selectUserByopenId" parameterType="String" resultMap="SysUserResult">
-		SELECT user_id, user_name, nick_name, user_type, open_id, open_id, del_flag FROM sys_user WHERE open_id = #{openId}
+		SELECT user_id, user_name, nick_name, user_type, user_system, open_id, open_id, del_flag FROM sys_user WHERE open_id = #{openId}
 	</select>
 
 	<select id="selectUserByTel" parameterType="String" resultMap="SysUserResult">
-		SELECT user_id, user_name, nick_name, user_type, phonenumber, open_id, session_key, del_flag FROM sys_user WHERE phonenumber = #{phonenumber} and user_type = '11'
+		SELECT user_id, user_name, nick_name, user_type, user_system, phonenumber, open_id, session_key, del_flag FROM sys_user WHERE phonenumber = #{phonenumber} and user_type = '11'
 	</select>
 
 	<select id="checkUserNameUnique" parameterType="String" resultType="int">
@@ -129,7 +133,7 @@
 		select user_id, email from sys_user where email = #{email} limit 1
 	</select>
 	<select id="warehouseSelectUserByTel" resultType="com.ruoyi.common.core.domain.entity.SysUser">
-		SELECT user_id, user_name, nick_name, user_type, phonenumber, open_id, session_key, del_flag FROM sys_user WHERE phonenumber = #{phonenumber} and user_type = '00'
+		SELECT user_id, user_name, nick_name, user_type, user_system, phonenumber, open_id, session_key, del_flag FROM sys_user WHERE phonenumber = #{phonenumber} and user_type = '00'
 	</select>
 
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
@@ -144,6 +148,7 @@
 		<if test="sex != null and sex != ''">sex,</if>
 		<if test="password != null and password != ''">password,</if>
 		<if test="userType != null and userType != ''">user_type,</if>
+		<if test="userSystem != null and userSystem != ''">user_system,</if>
 		<if test="openId != null and openId != ''">open_id,</if>
 		<if test="imgSrc != null and imgSrc != ''">img_src,</if>
 		<if test="sessionKey != null and sessionKey != ''">session_key,</if>
@@ -163,6 +168,7 @@
 		<if test="sex != null and sex != ''">#{sex},</if>
 		<if test="password != null and password != ''">#{password},</if>
 		<if test="userType != null and userType != ''">#{userType},</if>
+		<if test="userSystem != null and userSystem != ''">#{userSystem},</if>
 		<if test="openId != null and openId != ''">#{openId},</if>
 		<if test="imgSrc != null and imgSrc != ''">#{imgSrc},</if>
 		<if test="sessionKey != null and sessionKey != ''">#{sessionKey},</if>
@@ -185,6 +191,7 @@
 			<if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
 			<if test="password != null and password != ''">password = #{password},</if>
 			<if test="userType != null and userType != ''">user_type = #{userType},</if>
+			<if test="userSystem != null and userSystem != ''">user_system = #{userSystem},</if>
 			<if test="openId != null and openId != ''">open_id = #{openId},</if>
 			<if test="imgSrc != null and imgSrc != ''">img_src = #{imgSrc},</if>
 			<if test="sessionKey != null and sessionKey != ''">session_key = #{sessionKey},</if>