Merge remote-tracking branch 'origin/master'

wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml

@@ -83,6 +83,9 @@
         <set>
             <include refid="updateCondition"/>
         </set>
+        <where>
+            id = #{id}
+        </where>
     </update>
 
     <delete id="delById" parameterType="java.lang.Integer">

wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java

@@ -19,7 +19,7 @@ import java.util.Date;
 @Data
 @ApiModel(value = "User")
 @TableName("user_info")
-public class User extends Model<User> implements Serializable{
+public class User  implements Serializable{
     private static final long serialVersionUID = 2525339404301884673L;
 
     /**
@@ -100,12 +100,4 @@ public class User extends Model<User> implements Serializable{
      */
     @ApiModelProperty(name = "updateTime", value = "修改时间")
     private Date updateTime;
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java

@@ -267,8 +267,8 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         }
 
         //3、判断邀请人的注册时间是否大于当前用户
-        if (user.getCreateTime().getTime() > userCode.getCreateTime().getTime()) {
-            return R.error("请填写注册时间大于自己的用户邀请码!");
+        if (user.getCreateTime().getTime() < userCode.getCreateTime().getTime()) {
+            return R.error("请填写注册时间早于自己的用户邀请码!");
         }
 
         //4、设置用户被邀请码