Pre Merge pull request !402 from mashuo/springboot3

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

@@ -56,8 +56,8 @@ public class SysUser extends BaseEntity
     /** 密码 */
     private String password;
 
-    /** 账号状态（0正常 1停用） */
-    @Excel(name = "账号状态", readConverterExp = "0=正常,1=停用")
+    /** 帐号状态（0正常 1停用） */
+    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
     /** 删除标志（0代表存在 2代表删除） */
@@ -297,7 +297,6 @@ public class SysUser extends BaseEntity
     {
         this.roleId = roleId;
     }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-ui/src/views/system/user/authRole.vue

@@ -10,7 +10,7 @@
         </el-col>
         <el-col :span="8" :offset="2">
           <el-form-item label="登录账号" prop="userName">
-            <el-input v-model="form.userName" disabled />
+            <el-input  v-model="form.userName" disabled />
           </el-form-item>
         </el-col>
       </el-row>
@@ -20,10 +20,10 @@
     <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="table" @selection-change="handleSelectionChange" :data="roles.slice((pageNum-1)*pageSize,pageNum*pageSize)">
       <el-table-column label="序号" type="index" align="center">
         <template slot-scope="scope">
-          <span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
+          <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
         </template>
       </el-table-column>
-      <el-table-column type="selection" :reserve-selection="true" :selectable="checkSelectable" width="55" />
+      <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
       <el-table-column label="角色编号" align="center" prop="roleId" />
       <el-table-column label="角色名称" align="center" prop="roleName" />
       <el-table-column label="权限字符" align="center" prop="roleKey" />
@@ -52,14 +52,14 @@ export default {
   name: "AuthRole",
   data() {
     return {
-      // 遮罩层
+       // 遮罩层
       loading: true,
       // 分页信息
       total: 0,
       pageNum: 1,
       pageSize: 10,
       // 选中角色编号
-      roleIds: [],
+      roleIds:[],
       // 角色信息
       roles: [],
       // 用户信息
@@ -88,9 +88,7 @@ export default {
   methods: {
     /** 单击选中行数据 */
     clickRow(row) {
-      if (this.checkSelectable(row)) {
-        this.$refs.table.toggleRowSelection(row);
-      }
+      this.$refs.table.toggleRowSelection(row);
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -100,10 +98,6 @@ export default {
     getRowKey(row) {
       return row.roleId;
     },
-    // 检查角色状态
-    checkSelectable(row) {
-      return row.status === "0" ? true : false;
-    },
     /** 提交按钮 */
     submitForm() {
       const userId = this.form.userId;

sql/ry_20240629.sql

@@ -52,7 +52,7 @@ create table sys_user (
   sex               char(1)         default '0'                comment '用户性别（0男 1女 2未知）',
   avatar            varchar(100)    default ''                 comment '头像地址',
   password          varchar(100)    default ''                 comment '密码',
-  status            char(1)         default '0'                comment '账号状态（0正常 1停用）',
+  status            char(1)         default '0'                comment '帐号状态（0正常 1停用）',
   del_flag          char(1)         default '0'                comment '删除标志（0代表存在 2代表删除）',
   login_ip          varchar(128)    default ''                 comment '最后登录IP',
   login_date        datetime                                   comment '最后登录时间',