'1'

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

@@ -146,10 +146,10 @@ public class SysUserController extends BaseController
         {
             return Response.error(ResponseEnum.USER_ADD_ERROR_PHONE);
         }
-        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
-            return Response.error(ResponseEnum.USER_ADD_ERROR_MAIL);
-        }
+//        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+//        {
+//            return Response.error(ResponseEnum.USER_ADD_ERROR_MAIL);
+//        }
         user.setCreateBy(SecurityUtils.getUsername());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         return toResponse(userService.insertUser(user));

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

@@ -151,7 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="remark != null and remark != ''">remark,</if>
 			<if test="agentType != null and agentType != ''">agent_type,</if>
 			<if test="agentRemainingNumber != null and agentRemainingNumber != ''">agent_remaining_number,</if>
-			<if test="agentExpireTime != null and agentExpireTime != ''">agent_expire_time,</if>
+			<if test="agentExpireTime != null ">agent_expire_time,</if>
  			create_time
  		)values(
  			<if test="userId != null and userId != ''">#{userId},</if>
@@ -168,7 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="remark != null and remark != ''">#{remark},</if>
 			<if test="agentType != null and agentType != ''">#{agentType},</if>
 			<if test="agentRemainingNumber != null and agentRemainingNumber != ''">#{agentRemainingNumber},</if>
-			<if test="agentExpireTime != null and agentExpireTime != ''">#{agentExpireTime},</if>
+			<if test="agentExpireTime != null">#{agentExpireTime},</if>
  			sysdate()
  		)
 	</insert>