From 6e70319785ef4e5d1418e957c2c3bf2059a6eb5e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 10:36:36 +0800
Subject: [PATCH] 修改
---
ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AgentApplicationMapper.xml | 2 +-
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 2 +-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java | 10 ++++++++--
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
index 3b82526..978aacf 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -91,7 +91,7 @@
if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_FAIL_STATUS, "用户已停用，请联系管理员");
// throw new ServiceException("对不起，您的账号：" + username + " 已停用");
- throw new ServiceException("您的账号已被禁用，请联系平台");
+ throw new ServiceException("您所属门店已被冻结，请联系平台");
}
passwordService.validate(user, password, request);
recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_SUCCESS_STATUS, "登录成功");
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AgentApplicationMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AgentApplicationMapper.xml
index a681db5..9c925bc 100644
--- a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AgentApplicationMapper.xml
+++ b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AgentApplicationMapper.xml
@@ -39,7 +39,7 @@
and t2.phone like concat('%',#{agentQuery.phone},'%')
</if>
<if test="agentQuery.vipId !=null">
- and t1.applicationVipId = #{agentQuery.vipId}
+ and t1.application_vip_id = #{agentQuery.vipId}
</if>
<if test="agentQuery.status !=null">
and t1.status = #{agentQuery.status}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java
index 32aafb7..a1980d6 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java
@@ -76,6 +76,7 @@
Page<Technician> page = technicianService.lambdaQuery().like(name != null, Technician::getName, name)
.like(phone != null, Technician::getPhone, phone)
.eq(Technician::getShopId, sysUser.getObjectId())
+ .eq(Technician::getDelFlag, 0)
.page(Page.of(pageNum, pageSize));
return R.ok(page);
}
@@ -91,7 +92,10 @@
if (technician.getId()==null) {
technician.setSubscribeStatus(2);
- List<Technician> list = technicianService.lambdaQuery().eq(Technician::getPhone, technician.getPhone()).eq(Technician::getShopId, sysUser.getObjectId()).list();
+ List<Technician> list = technicianService.lambdaQuery()
+ .eq(Technician::getPhone, technician.getPhone())
+ .eq(Technician::getShopId, sysUser.getObjectId())
+ .eq(Technician::getDelFlag, 0).list();
if (!list.isEmpty()) {
return R.fail("当前号码已经添加");
}
@@ -113,7 +117,9 @@
if (byId.getPhone()!=technician.getPhone()){
List<Technician> list = technicianService.lambdaQuery()
.eq(Technician::getPhone, technician.getPhone())
- .ne(Technician::getId, byId.getId()).list();
+ .eq(Technician::getShopId, sysUser.getObjectId())
+ .ne(Technician::getId, byId.getId())
+ .eq(Technician::getDelFlag, 0).list();
if (!list.isEmpty()) {
return R.fail("当前号码已经添加");
}
--
Gitblit v1.7.1