fix: 优化业务逻辑

backend/src/main/java/com/yfd/platform/system/controller/UserController.java

@@ -202,7 +202,7 @@ public class UserController {
         return ResponseResult.success();
     }
 
-    @Log(module = "系统用户", value = "审核用户注册")
+//    @Log(module = "系统用户", value = "审核用户注册")
     @PostMapping("/auditUser")
     @Operation(summary = "审核用户注册")
     @ResponseBody
@@ -226,7 +226,7 @@ public class UserController {
     @GetMapping("/queryPendingAuditUsers")
     @Operation(summary = "查询待审核用户列表")
     @ResponseBody
-    public ResponseResult queryPendingAuditUsers(Page<SysUser> page,String name,String regStatus) {
+    public ResponseResult queryPendingAuditUsers(Page<SysUser> page,String name,Integer regStatus) {
         Page<SysUser> result = userService.queryPendingAuditUsers(page,name,regStatus);
         return ResponseResult.successData(result);
     }

backend/src/main/java/com/yfd/platform/system/service/impl/UserServiceImpl.java

@@ -1,9 +1,11 @@
 package com.yfd.platform.system.service.impl;
 
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -582,26 +584,26 @@ public class UserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impleme
 
     @Override
     public boolean auditUser(String userId, Integer auditStatus) {
-        UpdateWrapper<SysUser> updateWrapper = new UpdateWrapper<>();
+        LambdaUpdateWrapper<SysUser> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.eq("id", userId)
+        updateWrapper.eq(SysUser::getId, userId)
-                .set("reg_status", auditStatus)
+                .set(SysUser::getRegStatus, auditStatus)
-                .set("audit_user", SecurityUtils.getUserId())
+                .set(SysUser::getAuditUser, SecurityUtils.getUserId())
-                .set("audit_time", new Timestamp(System.currentTimeMillis()))
+                .set(SysUser::getAuditTime, new Timestamp(System.currentTimeMillis()))
-                .set("lastmodifydate", new Timestamp(System.currentTimeMillis()))
+                .set(SysUser::getLastmodifydate, new Timestamp(System.currentTimeMillis()))
-                .set("lastmodifier", getUsername());
+                .set(SysUser::getLastmodifier, SecurityUtils.getCurrentUsername());
         if (auditStatus == 1) {
-            updateWrapper.set("status", 1);
+            updateWrapper.set(SysUser::getStatus, 1);
         } else if (auditStatus == 2) {
-            updateWrapper.set("status", 0);
+            updateWrapper.set(SysUser::getStatus, 0);
         }
         return this.update(updateWrapper);
     }
 
     @Override
-    public Page<SysUser> queryPendingAuditUsers(Page<SysUser> page,String name,String regStatus) {
+    public Page<SysUser> queryPendingAuditUsers(Page<SysUser> page,String name,Integer regStatus) {
         LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(SysUser::getRegStatus, 0,1,2);
-        queryWrapper.eq(SysUser::getRegStatus, regStatus);
+        queryWrapper.eq(ObjectUtil.isNotEmpty(regStatus),SysUser::getRegStatus, regStatus);
         queryWrapper.and(StrUtil.isNotBlank(name), wrapper ->
                 wrapper.like(SysUser::getNickname, name)
                         .or()

backend/src/main/resources/mapper/system/SysUserMapper.xml

@@ -69,9 +69,10 @@
         u.lastmodifydate
         FROM
         sys_user u
-        where 1=1
+        WHERE
-        and (u.REG_STATUS!=0 and u.REG_STATUS !=2)
+        1 = 1
-        and u.usertype != 0
+        AND ( ( u.REG_STATUS != 0 AND u.REG_STATUS != 2 ) OR u.REG_STATUS IS NULL )
+        AND u.usertype != 0
         <if test="orgid != null">
             and u.orgid = #{orgid}
         </if>
@@ -81,15 +82,21 @@
         ORDER BY u.lastmodifydate DESC
     </select>
     <select id="getOrganizationByid" resultType="java.util.Map">
-                   SELECT DISTINCT
+        SELECT DISTINCT
-                    u.id,u.username,u.nickname,u.email,u.phone,u.avatar,o.orgname,o.id oid,
+            u.id AS "id",
-            op.orgname porgname ,op.id poid
+            u.username AS "username",
-        FROM
+            u.nickname AS "nickname",
-            sys_user u
+            u.email AS "email",
-            INNER JOIN sys_organization o ON u.orgid = o.id
+            u.phone AS "phone",
-            INNER JOIN sys_organization op ON o.parentid = op.id
+            u.avatar AS "avatar",
-        WHERE
+            o.orgname AS "orgname",
-            u.id = #{id}
+            o.id AS "oid",
+            op.orgname AS "porgname",
+            op.id AS "poid"
+        FROM sys_user u
+                 INNER JOIN sys_organization o ON u.orgid = o.id
+                 INNER JOIN sys_organization op ON o.parentid = op.id
+        WHERE u.id = #{id}
     </select>
 
     <delete id="delRoleUsersByUserid">