Merge branch 'master-fix' into dev

# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-impl-flowable/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderAbstractScript.java

yudao-module-bpm/yudao-module-bpm-impl-flowable/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderAbstractScript.java

@@ -7,7 +7,6 @@ import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.context.annotation.Lazy;
@@ -25,7 +24,6 @@ import static java.util.Collections.emptySet;
  *
  * @author 捷道源码
  */
-@Slf4j
 public abstract class BpmTaskAssignLeaderAbstractScript implements BpmTaskAssignScript {
 
     @Resource
@@ -50,10 +48,8 @@ public abstract class BpmTaskAssignLeaderAbstractScript implements BpmTaskAssign
                 if (dept == null) { // 找不到发起人的部门，所以无法使用该规则
                     return emptySet();
                 } else {
-                    log.error("1111:{}-{}", dept.getLeaderUserId(), startUserId);
                     if (dept.getLeaderUserId().equals(startUserId)) {
                         DeptRespDTO parentDept = deptApi.getDept(dept.getParentId());
-                        log.error("2222:{}", parentDept);
                         if (parentDept != null) { // 找不到父级部门，所以只好结束寻找。原因是：例如说，级别比较高的人，所在部门层级比较少
                             dept = parentDept;
                         } else {
@@ -69,8 +65,6 @@ public abstract class BpmTaskAssignLeaderAbstractScript implements BpmTaskAssign
                 dept = parentDept;
             }
         }
-
-        log.error("3333:{}", dept);
         return dept.getLeaderUserId() != null ? asSet(dept.getLeaderUserId()) : emptySet();
     }
 

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java

@@ -281,6 +281,7 @@ public class MemberUserServiceImpl implements MemberUserService {
                 .eq(MemberUserDO::getStatus, CommonStatusEnum.ENABLE.getStatus())
                 .and(StringUtils.isNotEmpty(searchKey),
                         i -> i.like(MemberUserDO::getNickname, searchKey).or().like(MemberUserDO::getMobile, searchKey))
+                .eq(MemberUserDO::getDeleted, 0)
                 .orderByDesc(MemberUserDO::getId);
 
         memberUserMapper.getPage(mpPage, wrapper);