From 1a05b1922feaea0bc7d0b2e7633bc6f343202a34 Mon Sep 17 00:00:00 2001 From: cjw Date: Wed, 9 Apr 2025 16:23:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/impl/XcxAuthStrategy.java | 11 +++- .../dromara/common/core/enums/UserType.java | 4 +- .../controller/scale/ArchiveController.java | 4 +- .../controller/system/SysUserController.java | 2 +- .../controller/wx/WxOrderController.java | 13 +++-- .../dromara/system/domain/bo/SysUserBo.java | 2 +- .../domain/vo/SysEvaluationConclusionVo.java | 4 +- .../system/domain/vo/SysUserImportVo.java | 34 ++---------- .../listener/SysUserImportListener.java | 54 ++++++++++--------- .../dromara/system/mapper/SysUserMapper.java | 1 + .../system/service/ISysDeptService.java | 4 ++ .../service/impl/CounselorServiceImpl.java | 3 +- .../service/impl/EvaluationServiceImpl.java | 19 ++++--- .../service/impl/SysDeptServiceImpl.java | 24 +++++++++ .../resources/mapper/system/ArchiveMapper.xml | 2 + .../resources/mapper/system/SysUserMapper.xml | 3 ++ 16 files changed, 113 insertions(+), 71 deletions(-) diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java index afbdf03..25fa8c0 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java @@ -129,6 +129,8 @@ public class XcxAuthStrategy implements IAuthStrategy { // 使用 openid 查询绑定用户 如未绑定用户 则根据业务自行处理 例如 创建默认用户 return TenantHelper.ignore(() -> { SysUser user = userMapper.selectOne(new LambdaQueryWrapper().eq(SysUser::getUserName, phoneNumber)); + //.eq(SysUser::getStatus, 0) + //.eq(SysUser::getDelFlag, 0)); if (ObjectUtil.isNull(user)) { //newUser.setDeptId(100L); SysUser newUser = new SysUser(); @@ -142,7 +144,14 @@ public class XcxAuthStrategy implements IAuthStrategy { userMapper.insert(newUser); return newUser; } else { - if (user.getOpenId().equals(openid)) { + String userOpenId = user.getOpenId(); + if (StringUtils.isEmpty(userOpenId)) { + user.setOpenId(openid); + userMapper.updateOpenIdById(openid, user.getUserId()); + //userMapper.updateById(user); + return user; + } + if (userOpenId.equals(openid)) { return user; } else { throw new UserException("此用户已被其他微信号绑定", phoneNumber); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java index 69e4753..0f05de4 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java @@ -22,7 +22,9 @@ public enum UserType { /** * app端 */ - APP_USER("app_user"); + APP_USER("app_user"), + + SYS_COUNSELOR("sys_counselor"); private final String userType; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ArchiveController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ArchiveController.java index c0958d5..6c16976 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ArchiveController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/scale/ArchiveController.java @@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import lombok.RequiredArgsConstructor; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.vo.ArchiveStatisticVo; import org.dromara.system.domain.vo.ArchiveVo; @@ -35,13 +36,14 @@ public class ArchiveController extends BaseController { public TableDataInfo pageList(ArchiveVo vo, PageQuery pageQuery) { return archiveService.queryPageList(vo, pageQuery); } + /** * 获取档案静态列表 */ @SaCheckPermission("scale:archive:list") @GetMapping("/statistic/pageList") public TableDataInfo statisticPageList(Long userId, PageQuery pageQuery) { - return archiveService.queryStatisticPageList(userId, pageQuery); + return TenantHelper.ignore(() -> archiveService.queryStatisticPageList(userId, pageQuery)); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java index 36104d6..78909a7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java @@ -85,7 +85,7 @@ public class SysUserController extends BaseController { @SaCheckPermission("system:user:import") @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception { - ExcelResult result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener(updateSupport)); + ExcelResult result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener()); return R.ok(result.getAnalysis()); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxOrderController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxOrderController.java index 917a774..cfb32af 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxOrderController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxOrderController.java @@ -4,6 +4,7 @@ import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.TenantConstants; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -48,7 +49,7 @@ public class WxOrderController extends BaseController { public TableDataInfo scaleOrderList(SysScaleOrderBo bo, PageQuery pageQuery) { Long userId = LoginHelper.getUserId(); bo.setCreateBy(userId); - return scaleOrderService.queryPageList(bo, pageQuery); + return TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID, () -> scaleOrderService.queryPageList(bo, pageQuery)); } /** @@ -71,7 +72,13 @@ public class WxOrderController extends BaseController { public R addScale(@Validated(AddGroup.class) @RequestBody SysScaleOrderBo bo, HttpServletRequest request) throws Exception { String clientIpAddress = getClientIpAddress(request); bo.setSpbillCreateIp(clientIpAddress); - return R.ok(scaleOrderService.insertByBo(bo)); + return R.ok(TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID, () -> { + try { + return scaleOrderService.insertByBo(bo); + } catch (Exception e) { + throw new RuntimeException(e); + } + })); } /** @@ -105,7 +112,7 @@ public class WxOrderController extends BaseController { Long userId = LoginHelper.getUserId(); bo.setCounselorId(userId); bo.setCreateBy(null); - return TenantHelper.ignore(() ->reservationOrderService.queryPageList(bo, pageQuery)); + return TenantHelper.ignore(() -> reservationOrderService.queryPageList(bo, pageQuery)); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java index 46a3508..f289298 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java @@ -97,7 +97,7 @@ public class SysUserBo extends BaseEntity { /** * 角色组 */ - @Size(min = 1, message = "用户角色不能为空") + //@Size(min = 1, message = "用户角色不能为空") private Long[] roleIds; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysEvaluationConclusionVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysEvaluationConclusionVo.java index 6524fbd..fb89c63 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysEvaluationConclusionVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysEvaluationConclusionVo.java @@ -31,6 +31,8 @@ public class SysEvaluationConclusionVo implements Serializable { @ExcelProperty(value = "") private Long id; + private String tenantId; + /** * td_evaluation_record表id */ @@ -92,6 +94,4 @@ public class SysEvaluationConclusionVo implements Serializable { private String situationName; - - } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java index c34a23c..7ae8e46 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java @@ -23,42 +23,25 @@ public class SysUserImportVo implements Serializable { @Serial private static final long serialVersionUID = 1L; - /** - * 用户ID - */ - @ExcelProperty(value = "用户序号") - private Long userId; - /** * 部门ID */ - @ExcelProperty(value = "部门编号") - private Long deptId; + @ExcelProperty(value = "部门名称") + @ExcelDictFormat(dictType = "dept") + private String deptName; /** * 用户账号 */ - @ExcelProperty(value = "登录名称") + @ExcelProperty(value = "登录账号(手机号)") private String userName; /** * 用户昵称 */ - @ExcelProperty(value = "用户名称") + @ExcelProperty(value = "姓名") private String nickName; - /** - * 用户邮箱 - */ - @ExcelProperty(value = "用户邮箱") - private String email; - - /** - * 手机号码 - */ - @ExcelProperty(value = "手机号码") - private String phonenumber; - /** * 用户性别 */ @@ -66,11 +49,4 @@ public class SysUserImportVo implements Serializable { @ExcelDictFormat(dictType = "sys_user_sex") private String sex; - /** - * 帐号状态（0正常 1停用） - */ - @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_normal_disable") - private String status; - } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java index c20a4ec..4c0a0c6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java @@ -5,16 +5,19 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.crypto.digest.BCrypt; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; +import org.dromara.common.core.enums.UserType; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.ValidatorUtils; import org.dromara.common.excel.core.ExcelListener; import org.dromara.common.excel.core.ExcelResult; import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.system.domain.bo.SysUserBo; import org.dromara.system.domain.vo.SysUserImportVo; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.service.ISysConfigService; +import org.dromara.system.service.ISysDeptService; import org.dromara.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; @@ -32,7 +35,7 @@ public class SysUserImportListener extends AnalysisEventListener this.userService.selectUserByUserName(userVo.getUserName())); + + Long deptId = deptService.selectIdByName(userVo.getDeptName()); + if (deptId == null) { + deptId = deptService.selectId4Parent(); + } try { - // 验证是否存在这个用户 - if (ObjectUtil.isNull(sysUser)) { - SysUserBo user = BeanUtil.toBean(userVo, SysUserBo.class); - ValidatorUtils.validate(user); - user.setPassword(password); - user.setCreateBy(operUserId); - userService.insertUser(user); - successNum++; - successMsg.append("
").append(successNum).append("、账号 ").append(user.getUserName()).append(" 导入成功"); - } else if (isUpdateSupport) { - Long userId = sysUser.getUserId(); - SysUserBo user = BeanUtil.toBean(userVo, SysUserBo.class); - user.setUserId(userId); - ValidatorUtils.validate(user); - userService.checkUserAllowed(user.getUserId()); - userService.checkUserDataScope(user.getUserId()); - user.setUpdateBy(operUserId); - userService.updateUser(user); - successNum++; - successMsg.append("
").append(successNum).append("、账号 ").append(user.getUserName()).append(" 更新成功"); + if (deptId != null) { + // 验证是否存在这个用户 + if (ObjectUtil.isNull(sysUser)) { + SysUserBo user = BeanUtil.toBean(userVo, SysUserBo.class); + user.setUserType(UserType.APP_USER.getUserType()); + user.setPassword(password); + user.setDeptId(deptId); + user.setCreateBy(operUserId); + ValidatorUtils.validate(user); + userService.insertUser(user); + successNum++; + successMsg.append("
").append(successNum).append("、账号 ").append(user.getUserName()).append(" 导入成功"); + } else { + failureNum++; + failureMsg.append("
").append(failureNum).append("、账号 ").append(userVo.getUserName()).append(" 已存在"); + } } else { failureNum++; - failureMsg.append("
").append(failureNum).append("、账号 ").append(sysUser.getUserName()).append(" 已存在"); + failureMsg.append("
").append(failureNum).append("、账号 ").append(userVo.getUserName()).append(" 的部门不存在或没有主公司"); } } catch (Exception e) { failureNum++; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java index 3f3592e..5d3a7a6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java @@ -92,4 +92,5 @@ public interface SysUserMapper extends BaseMapperPlus { List findUserByIds(String userIds); + int updateOpenIdById(@Param("openId") String openId, @Param("userId") Long userId); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java index bf16642..008d2de 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java @@ -122,4 +122,8 @@ public interface ISysDeptService { * @return 结果 */ int deleteDeptById(Long deptId); + + Long selectIdByName(String deptName); + + Long selectId4Parent(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/CounselorServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/CounselorServiceImpl.java index 063004d..2b66273 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/CounselorServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/CounselorServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.enums.UserType; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.service.DictService; import org.dromara.common.core.service.OssService; @@ -229,7 +230,7 @@ public class CounselorServiceImpl implements ICounselorService { } user.setNickName(bo.getName()); user.setPassword(BCrypt.hashpw("Mz123456!")); - user.setUserType("sys_counselor"); + user.setUserType(UserType.SYS_COUNSELOR.getUserType()); userService.insertUser(user); Counselor add = MapstructUtils.convert(bo, Counselor.class); add.setId(user.getUserId()); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EvaluationServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EvaluationServiceImpl.java index 7718fdd..ad7b263 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EvaluationServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/EvaluationServiceImpl.java @@ -137,7 +137,7 @@ public class EvaluationServiceImpl implements IEvaluationService { @Override public Map submitAnswer(SubmitAnswerBo bo) { LoginUser loginUser = getLoginUser(); - String userType = loginUser.getUserType(); + //String userType = loginUser.getUserType(); // if (!UserType.STUDENT.getName().equals(userType)) { // throw new ServiceException("只有学生账户才能测评"); // } @@ -156,6 +156,7 @@ public class EvaluationServiceImpl implements IEvaluationService { boolean allowQueryResult = true; Long scaleId = bo.getScaleId(); SysScale sysScale = scaleMapper.selectById(scaleId); + String tenantId = sysScale.getTenantId(); Map> answerMapByQuestion = scaleAnswerService.getScaleAnswerMap(scaleId); int keySize = answerMapByQuestion.keySet().size(); if (ObjectUtil.isEmpty(answerList)) { @@ -175,10 +176,10 @@ public class EvaluationServiceImpl implements IEvaluationService { List list; if (sysScale.getScaleName().contains("MBTI")) { //MBTI 另外处理 - list = calculateMBTIResult(scaleId, answerList); + list = calculateMBTIResult(scaleId, tenantId, answerList); } else { //计算 - list = calculateEvaluationResult(scaleId, answerList); + list = calculateEvaluationResult(scaleId, tenantId, answerList); } List conclusionAdd = MapstructUtils.convert(list, SysEvaluationConclusion.class); evaluationConclusionMapper.insertBatch(conclusionAdd); @@ -219,7 +220,7 @@ public class EvaluationServiceImpl implements IEvaluationService { } else { Integer freeFlag = sysScale.getFreeFlag(); //不是免费的 - if(StatusEnum.DISABLED.getValue().equals(freeFlag)) { + if (StatusEnum.DISABLED.getValue().equals(freeFlag)) { //个人要更新订单状态 SysScaleOrder scaleOrder = orderMapper.selectOne(new LambdaQueryWrapper().eq(SysScaleOrder::getRecordId, recordId)); SysScaleOrder order = new SysScaleOrder(); @@ -248,7 +249,9 @@ public class EvaluationServiceImpl implements IEvaluationService { } - private List calculateEvaluationResult(Long scaleId, List answerList) { + private List calculateEvaluationResult(Long scaleId, String tenantId, List answerList) { + //LoginUser loginUser = getLoginUser(); + //String tenantId = loginUser.getTenantId(); Long recordId = answerList.get(0).getRecordId(); //暂时使用string解决redis转换问题 //key为factorId @@ -265,6 +268,7 @@ public class EvaluationServiceImpl implements IEvaluationService { SysEvaluationConclusionVo evalConclusion = new SysEvaluationConclusionVo(); evalConclusion.setFactorName(scaleFactor.getFactorName()); + evalConclusion.setTenantId(tenantId); evalConclusion.setFactorId(factorId); evalConclusion.setRecordId(recordId); evalConclusion.setStatus(StatusEnum.DISABLED.getValue()); @@ -419,7 +423,9 @@ public class EvaluationServiceImpl implements IEvaluationService { } } - private List calculateMBTIResult(Long scaleId, List answerList) { + private List calculateMBTIResult(Long scaleId, String tenantId, List answerList) { + //LoginUser loginUser = getLoginUser(); + //String tenantId = loginUser.getTenantId(); Long recordId = answerList.get(0).getRecordId(); //key为questionID ConcurrentHashMap charNumMap = new ConcurrentHashMap<>(8); @@ -460,6 +466,7 @@ public class EvaluationServiceImpl implements IEvaluationService { if (Objects.equals(collect, split)) { SysEvaluationConclusionVo evalConclusion = new SysEvaluationConclusionVo(); evalConclusion.setFactorName(scaleFactor.getFactorName()); + evalConclusion.setTenantId(tenantId); evalConclusion.setFactorId(scaleFactor.getFactorId()); evalConclusion.setRecordId(recordId); evalConclusion.setStatus(StatusEnum.IN_USE.getValue()); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java index 5054036..0508856 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java @@ -334,4 +334,28 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { return baseMapper.deleteById(deptId); } + @Override + public Long selectIdByName(String deptName) { + SysDept sysDept = baseMapper.selectOne(new LambdaQueryWrapper() + .select(SysDept::getDeptId) + .eq(SysDept::getDeptName, deptName) + .eq(SysDept::getStatus, 0)); + if (ObjectUtil.isNotEmpty(sysDept)) { + return sysDept.getDeptId(); + } else { + return null; + } + } + @Override + public Long selectId4Parent(){ + SysDept sysDept = baseMapper.selectOne(new LambdaQueryWrapper() + .select(SysDept::getDeptId) + .eq(SysDept::getParentId, 0) + .eq(SysDept::getStatus, 0)); + if (ObjectUtil.isNotEmpty(sysDept)) { + return sysDept.getDeptId(); + } else { + return null; + } + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ArchiveMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ArchiveMapper.xml index d4525a1..9fde8eb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ArchiveMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/ArchiveMapper.xml @@ -16,6 +16,8 @@ from sys_user u left join sys_dept d on d.dept_id = u.dept_id where u.user_type = 'app_user' + and u.status = 0 + and u.del_flag = 0 and u.nick_name like CONCAT('%', #{query.nickName}, '%') diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 55b141e..f301047 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -80,5 +80,8 @@ + + update sys_user set open_id = #{openId} where user_id= #{userId} +