hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmSupervisionManager.java

@@ -14,7 +14,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.itextpdf.text.PageSize;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsState;
-import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType.AreaType;
 import com.qunzhixinxi.hnqz.admin.api.dto.WmSupervisionDto;
 import com.qunzhixinxi.hnqz.admin.api.dto.WmSupervisionDto.OnTaskSupervision;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
@@ -32,6 +31,7 @@ import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskSupervision;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskSupervisionAdvice;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskType;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmWarnUserRelation;
+import com.qunzhixinxi.hnqz.admin.mapper.SysUserMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmDaDrugEntDrugtableMapper;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.admin.service.SysEnterpriseAreaService;
@@ -51,7 +51,6 @@ import com.qunzhixinxi.hnqz.admin.service.WmTaskSupervisionService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskTypeService;
 import com.qunzhixinxi.hnqz.admin.service.WmWarnUserRelationService;
 import com.qunzhixinxi.hnqz.admin.util.OsEnvUtils;
-import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
 import com.qunzhixinxi.hnqz.common.core.exception.BizException;
 import com.qunzhixinxi.hnqz.common.core.util.PdfUtils;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
@@ -83,7 +82,6 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
 /**
@@ -110,6 +108,7 @@ public class WmSupervisionManager {
   private final WmTaskService taskService;
   private final SysDeptService deptService;
   private final SysUserService userService;
+  private final SysUserMapper userMapper;
   private final SysEnterpriseAreaService enterpriseAreaService;
   private final WmRoleSupervisionWarnRuleService warnRuleService;
   private final SysRoleService roleService;
@@ -1531,12 +1530,8 @@ public class WmSupervisionManager {
     List<Integer> userIds1;
     if (StrUtil.isNotBlank(memberName)) {
       userIds1 =
-          userService
-              .list(
-                  Wrappers.<SysUser>lambdaQuery()
-                      .eq(SysUser::getLockFlag, CommonConstants.STATUS_NORMAL)
-                      .eq(SysUser::getDelFlag, CommonConstants.STATUS_NORMAL)
-                      .like(SysUser::getRealname, memberName.trim()))
+          userMapper
+              .listAllUserByRealname(memberName.trim())
               .stream()
               .mapToInt(SysUser::getUserId)
               .boxed()

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/SysUserMapper.java

@@ -118,4 +118,12 @@ public interface SysUserMapper extends DataScopeMapper<SysUser> {
      * @return {@link List}<{@link SysUser}> 结果
      */
     List<UserVO> listUserByRole(@Param("query") UserDTO userDTO);
+
+    /**
+     * 按姓名模糊查询（已删除的也会被查到）
+     *
+     * @param realName 真实姓名
+     * @return {@link List }<{@link SysUser }> 用户列表
+     */
+    List<SysUser> listAllUserByRealname(@Param("realName") String realName);
 }

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -752,4 +752,16 @@
         </where>
         ORDER BY u.create_time DESC
     </select>
+
+    <select id="listAllUserByRealname" resultType="com.qunzhixinxi.hnqz.admin.api.entity.SysUser">
+        SELECT
+        *
+        FROM
+        sys_user u
+        <where>
+            <if test="realName != null and realName != ''">
+                AND u.realname LIKE CONCAT('%',#{realName},'%')
+            </if>
+        </where>
+    </select>
 </mapper>