20241128_sun

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -215,8 +215,8 @@ public class SysUserController extends BaseController
     @PutMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysUser user)
     {
-        userService.checkUserAllowed(user);
-        userService.checkUserDataScope(user.getUserId());
+//        userService.checkUserAllowed(user);
+//        userService.checkUserDataScope(user.getUserId());
         user.setUpdateBy(getUsername());
         return toAjax(userService.updateUserStatus(user));
     }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -14,7 +14,7 @@ import com.ruoyi.common.xss.Xss;
 
 /**
  * 用户对象 sys_user
- * 
+ *
  * @author ruoyi
  */
 public class SysUser extends BaseEntity
@@ -83,6 +83,8 @@ public class SysUser extends BaseEntity
     /** 角色组 */
     private Long[] roleIds;
 
+    private Long[] userIds;
+
     /** 岗位组 */
     private Long[] postIds;
 
@@ -119,6 +121,14 @@ public class SysUser extends BaseEntity
         return userId != null && 1L == userId;
     }
 
+    public Long[] getUserIds() {
+        return userIds;
+    }
+
+    public void setUserIds(Long[] userIds) {
+        this.userIds = userIds;
+    }
+
     public Long getDeptId()
     {
         return deptId;

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java

@@ -97,6 +97,7 @@ public class SysRegisterService
         {
             sysUser.setNickName(username);
             sysUser.setPassword(SecurityUtils.encryptPassword(password));
+            sysUser.setStatus("1"); // 待审核
             boolean regFlag = userService.registerUser(sysUser);
             if (!regFlag)
             {

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java

@@ -50,7 +50,7 @@ public class UserDetailsServiceImpl implements UserDetailsService
         else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
         {
             log.info("登录用户：{} 已被停用.", username);
-            throw new ServiceException("对不起，您的账号：" + username + " 已停用");
+            throw new ServiceException("对不起，您注册的账号：" + username + " 正在审核");
         }
 
         passwordService.validate(user);

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import javax.validation.Validator;
 
 import com.ruoyi.common.core.domain.entity.ExSysUser;
@@ -336,9 +337,15 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public int updateUserStatus(SysUser user)
-    {
-        return userMapper.updateUser(user);
+    public int updateUserStatus(SysUser user) {
+        List<Long> userList = Stream.of(user.getUserIds()).collect(Collectors.toList());
+        userList.forEach(u -> {
+            SysUser up = new SysUser();
+            up.setUserId(u);
+            up.setStatus(user.getStatus());
+            userMapper.updateUser(up);
+        });
+        return 1;
     }
 
     /**

ruoyi-ui/src/api/system/user.js

@@ -67,7 +67,7 @@ export function resetUserPwd(userId, password) {
 // 用户状态修改
 export function changeUserStatus(userId, status) {
   const data = {
-    userId,
+    userIds: userId,
     status
   }
   return request({

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

@@ -101,6 +101,17 @@
               v-hasPermi="['system:user:add']"
             >批量新增</el-button>
           </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-edit"
+              size="mini"
+              :disabled="multiple"
+              @click="handleStatusChangeSh"
+              v-hasPermi="['system:user:edit']"
+            >批量审核</el-button>
+          </el-col>
           <el-col :span="1.5">
             <el-button
               type="success"
@@ -175,6 +186,14 @@
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope" v-if="scope.row.userId !== 1">
+              <el-button
+                v-if="scope.row.deptId == 110 && scope.row.status == '1'"
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleStatusChangeSh(scope.row)"
+                v-hasPermi="['system:user:edit']"
+              >通过审核</el-button>
               <el-button
                 size="mini"
                 type="text"
@@ -550,13 +569,30 @@ export default {
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用";
       this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
-        return changeUserStatus(row.userId, row.status);
+        const ids = [];
+        ids.push(row.userId);
+        return changeUserStatus(ids, row.status);
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");
       }).catch(function() {
         row.status = row.status === "0" ? "1" : "0";
       });
     },
+    handleStatusChangeSh(row) {
+      let ids = [];
+      if (row.userId) {
+        ids.push(row.userId)
+      } else {
+        ids = this.ids;
+      }
+      const text = "审核通过";
+      this.$modal.confirm('确认要"' + text + '""' + (row.userName ? row.userName : '选中的') + '"用户吗？').then(function() {
+        return changeUserStatus(ids, "0");
+      }).then(() => {
+        this.$modal.msgSuccess("审核成功");
+        this.getList();
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;