'用户新增驾校角色'

jkt-admin/src/main/java/com/miaxis/system/controller/system/SysUserController.java

@@ -169,10 +169,10 @@ public class SysUserController extends BaseController
         {
             return Response.error(ResponseEnum.USER_UPDATE_ERROR_PHONE);
         }
-        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
-            return Response.error(ResponseEnum.USER_UPDATE_ERROR_MAIL);
-        }
+//        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+//        {
+//            return Response.error(ResponseEnum.USER_UPDATE_ERROR_MAIL);
+//        }
         user.setUpdateBy(SecurityUtils.getUsername());
         return toResponse(userService.updateUser(user));
     }

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

@@ -107,6 +107,10 @@ public class SysUser extends BaseEntity
     @ApiModelProperty(value = "剩余数量")
     private Integer agentRemainingNumber;
 
+    /** 推荐码 */
+    @ApiModelProperty(value = "推荐码")
+    private String referralCode;
+
     /** 限时过期时间 */
     @Excel(name = "限时过期时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

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

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="agentType"     column="agent_type"    />
 		<result property="agentRemainingNumber"   column="agent_remaining_number"  />
 		<result property="agentExpireTime"       column="agent_expire_time"       />
+		<result property="referralCode"       column="referral_code"       />
 		<association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
 		<collection  property="roles"   javaType="java.util.List"        resultMap="RoleResult" />
 	</resultMap>
@@ -49,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<sql id="selectUserVo">
-        select u.agent_type,u.agent_remaining_number,u.agent_expire_time,u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+        select u.referral_code,u.agent_type,u.agent_remaining_number,u.agent_expire_time,u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, 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
         from sys_user u
@@ -152,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="agentType != null and agentType != ''">agent_type,</if>
 			<if test="agentRemainingNumber != null and agentRemainingNumber != ''">agent_remaining_number,</if>
 			<if test="agentExpireTime != null ">agent_expire_time,</if>
+			<if test="referralCode != null and referralCode != ''">referral_code,</if>
  			create_time
  		)values(
  			<if test="userId != null and userId != ''">#{userId},</if>
@@ -169,6 +171,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="agentType != null and agentType != ''">#{agentType},</if>
 			<if test="agentRemainingNumber != null and agentRemainingNumber != ''">#{agentRemainingNumber},</if>
 			<if test="agentExpireTime != null">#{agentExpireTime},</if>
+			<if test="referralCode != null and referralCode != ''">#{referralCode},</if>
  			sysdate()
  		)
 	</insert>
@@ -192,6 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="agentType != null and agentType != ''">agent_type = #{agentType},</if>
 			<if test="agentRemainingNumber != null and agentRemainingNumber != ''">agent_remaining_number = #{agentRemainingNumber},</if>
 			<if test="agentExpireTime != null and agentExpireTime != ''">agent_expire_time = #{agentExpireTime},</if>
+			<if test="referralCode != null and referralCode != ''">referral_code = #{referralCode},</if>
  			update_time = sysdate()
  		</set>
  		where user_id = #{userId}