From 10c5247722995e571b3fd4dbffb178964a9bd6ee Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 05 十一月 2025 10:51:54 +0800
Subject: [PATCH] 台账添加错误问题修改
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/auth/service/OuterAppScanService.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/auth/service/OuterAppScanService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/auth/service/OuterAppScanService.java
index dd386c5..2ad6f57 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/auth/service/OuterAppScanService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/auth/service/OuterAppScanService.java
@@ -11,14 +11,14 @@
import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.auth.utils.TokenUtil;
-import com.qianwen.smartman.modules.cps.entity.Employee;
-import com.qianwen.smartman.modules.cps.service.IEmployeeService;
+import com.qianwen.smartman.modules.smis.entity.Employee;
+import com.qianwen.smartman.modules.smis.service.IEmployeeService;
import com.qianwen.smartman.modules.sync.constant.DingConstant;
import com.qianwen.smartman.modules.sync.constant.QyWechatConstant;
import com.qianwen.smartman.modules.sync.entity.QyUser;
import com.qianwen.smartman.modules.sync.enums.SseEventEnum;
import com.qianwen.smartman.modules.sync.message.sse.SseEmitterServer;
-import com.qianwen.smartman.modules.sync.service.impl.WechatSyncServiceImpl;
+//import com.qianwen.smartman.modules.sync.service.impl.WechatSyncServiceImpl;
import com.qianwen.smartman.modules.sync.util.CodeUtil;
import com.qianwen.smartman.modules.system.entity.UserInfo;
import com.qianwen.smartman.modules.system.entity.UserOauth;
@@ -32,15 +32,15 @@
private final IUserOauthService userOauthService;
private final IEmployeeService employeeService;
private final IUserService userServices;
- private final WechatSyncServiceImpl wechatSyncService;
+ //private final WechatSyncServiceImpl wechatSyncService;
private final SseEmitterServer sseEmitterServer;
-
- public OuterAppScanService(IUserOauthService userOauthService, IEmployeeService employeeService, IUserService userServices, WechatSyncServiceImpl wechatSyncService, SseEmitterServer sseEmitterServer) {
+ //WechatSyncServiceImpl wechatSyncService,
+ public OuterAppScanService(IUserOauthService userOauthService, IEmployeeService employeeService, IUserService userServices, SseEmitterServer sseEmitterServer) {
this.userOauthService = userOauthService;
this.employeeService = employeeService;
this.userServices = userServices;
- this.wechatSyncService = wechatSyncService;
+ //this.wechatSyncService = wechatSyncService;
this.sseEmitterServer = sseEmitterServer;
}
@@ -92,7 +92,7 @@
return R.data(TokenUtil.createAuthInfo(userInfo));
*/
}
-
+ /*
public R<Kv> qyScanLogin(String clientId, String code) {
if (CodeUtil.verifyLoginCodeExpire(clientId).booleanValue()) {
@@ -102,17 +102,18 @@
}
QyUser scanUser = this.wechatSyncService.getScanUser(code, clientId);
String appUserMsg = MessageUtils.message("sys.outer.user.not.exist", new Object[0]);
+
if (Objects.isNull(scanUser)) {
this.sseEmitterServer.sendMsg(clientId, appUserMsg, SseEventEnum.ERROR_MSG_ID.getEventId());
throw new ServiceException(appUserMsg);
- }
+ }*
UserOauth userOauth = this.userOauthService.getOne(Wrappers.<UserOauth>lambdaQuery().eq(UserOauth::getUuid, scanUser.getUserid()).eq(UserOauth::getSource,QyWechatConstant.QY_SOURCE));
if (Func.isEmpty(userOauth)) {
this.sseEmitterServer.sendMsg(clientId, appUserMsg, SseEventEnum.ERROR_MSG_ID.getEventId());
throw new ServiceException(appUserMsg);
}
- Employee employee = this.wechatSyncService.createOrModifyEmployee(scanUser, userOauth);
+ //Employee employee = this.wechatSyncService.createOrModifyEmployee(scanUser, userOauth);
String userBingMsg = MessageUtils.message("sys.outer.user.not.bind.account", new Object[0]);
if (StrUtil.isEmpty(employee.getUserId())) {
this.sseEmitterServer.sendMsg(clientId, userBingMsg, SseEventEnum.ERROR_MSG_ID.getEventId());
@@ -129,4 +130,5 @@
CodeUtil.failureCode(cacheKey);
return R.data(authInfo);
}
+*/
}
--
Gitblit v1.9.3