diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java index a5cd6e820..56467942e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java @@ -9,8 +9,8 @@ import lombok.SneakyThrows; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.ConvertUtils; import org.nl.common.constants.FieldConstant; -import org.nl.common.domain.query.PageQuery; import org.nl.common.constants.GeneralDefinition; +import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.config.FileProperties; import org.nl.modules.common.utils.FileUtil; diff --git a/lms/nladmin-ui/src/views/system/user/index.vue b/lms/nladmin-ui/src/views/system/user/index.vue index f1dec7103..5d19eee73 100644 --- a/lms/nladmin-ui/src/views/system/user/index.vue +++ b/lms/nladmin-ui/src/views/system/user/index.vue @@ -661,7 +661,7 @@ export default { this.$nextTick(function() { for (let j = 0; j < row.roles.length; j++) { for (let i = 0; i < this.rolesDatas.length; i++) { - if (this.rolesDatas[i].roleId == row.roles[j].roleId) { + if (this.rolesDatas[i].role_id == row.roles[j].role_id) { this.$refs.roleTable.toggleRowSelection(this.rolesDatas[i], true) break }