diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java index d6c378b3..db299a0e 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java @@ -166,6 +166,7 @@ public class SystemAdminServiceImpl implements ISystemAdminService { model.setPassword(pwd); model.setSalt(salt); model.setSort(systemAdminParam.getSort()); + model.setIsMultipoint(systemAdminParam.getIsMultipoint()); model.setIsDisable(systemAdminParam.getIsDisable()); model.setCreateTime(System.currentTimeMillis() / 1000); model.setUpdateTime(System.currentTimeMillis() / 1000); @@ -210,6 +211,7 @@ public class SystemAdminServiceImpl implements ISystemAdminService { model.setAvatar( UrlUtil.toRelativeUrl(systemAdminParam.getAvatar())); model.setRole(systemAdminParam.getId() == 1 ? 0 : systemAdminParam.getRole()); model.setSort(systemAdminParam.getSort()); + model.setIsMultipoint(systemAdminParam.getIsMultipoint()); model.setIsDisable(systemAdminParam.getIsDisable()); model.setUpdateTime(System.currentTimeMillis() / 1000); diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAdminParam.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAdminParam.java index 08cfe78b..713a2ddd 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAdminParam.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAdminParam.java @@ -1,6 +1,7 @@ package com.hxkj.admin.validate.system; import com.hxkj.common.validator.annotation.IDMust; +import com.hxkj.common.validator.annotation.IntegerContains; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; @@ -44,11 +45,15 @@ public class SystemAdminParam implements Serializable { private String password; @NotNull(message = "请选择状态", groups = {create.class, update.class}) + @IntegerContains(values = {0, 1}, message = "isDisable参数不在合法值内", groups = {create.class, update.class}) private Integer isDisable; - @NotNull(message = "排序号不能为空", groups = {create.class, update.class}) + @NotNull(message = "请选择是否支持多端登录", groups = {create.class, update.class}) + @IntegerContains(values = {0, 1}, message = "isMultipoint参数不在合法值内", groups = {create.class, update.class}) + private Integer isMultipoint; + @DecimalMin(value = "0", message = "排序号值不能少于0", groups = {create.class, update.class}) - private Integer sort; + private Integer sort = 0; private String avatar = ""; diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAdminVo.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAdminVo.java index 13b44e3c..c21e002b 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAdminVo.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAdminVo.java @@ -17,6 +17,7 @@ public class SystemAdminVo implements Serializable { private String nickname; private String avatar; private String role; + private Integer isMultipoint; private Integer isDisable; private String lastLoginIp; private String lastLoginTime; diff --git a/like-framework/like-common/src/main/java/com/hxkj/common/entity/system/SystemAdmin.java b/like-framework/like-common/src/main/java/com/hxkj/common/entity/system/SystemAdmin.java index ce7d2b71..ef85865d 100644 --- a/like-framework/like-common/src/main/java/com/hxkj/common/entity/system/SystemAdmin.java +++ b/like-framework/like-common/src/main/java/com/hxkj/common/entity/system/SystemAdmin.java @@ -23,6 +23,7 @@ public class SystemAdmin implements Serializable { private String salt; private Integer role; private Integer sort; + private Integer isMultipoint; private Integer isDisable; private Integer isDelete; private String lastLoginIp;