From 0ffdf00009b0bede0859fa33deddefb55c075a7b Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 01 二月 2026 16:42:36 +0800
Subject: [PATCH] feat:优化增加任务同步接口，允许前端手动控制同步
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserSyncServiceImpl.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserSyncServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserSyncServiceImpl.java
index 58689a0..e200cec 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserSyncServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserSyncServiceImpl.java
@@ -55,7 +55,7 @@
* @return 鍚屾缁撴灉
*/
@Override
- @Transactional
+
public AjaxResult syncOaUsers(List<UserSyncDTO> oaUsers)
{
try
@@ -65,7 +65,7 @@
return AjaxResult.warn("浼犲叆鐨勭敤鎴锋暟鎹负绌�");
}
- log.info("寮�濮嬪悓姝� {} 鏉A鐢ㄦ埛鏁版嵁鍒� MySQL 鏁版嵁搴�...", oaUsers.size());
+// log.info("寮�濮嬪悓姝� {} 鏉A鐢ㄦ埛鏁版嵁鍒� MySQL 鏁版嵁搴�...", oaUsers.size());
int createdCount = 0;
int updatedCount = 0;
@@ -109,8 +109,8 @@
// 鐢ㄦ埛宸插瓨鍦紝鏇存柊淇℃伅
updateExistingUser(existingUser, dto, deptId);
updatedCount++;
- log.info("鏇存柊鐢ㄦ埛: {} ({}), oaUserId: {}",
- dto.getNickName(), dto.getUserName(), dto.getOaUserId());
+// log.info("鏇存柊鐢ㄦ埛: {} ({}), oaUserId: {}",
+// dto.getNickName(), dto.getUserName(), dto.getOaUserId());
}
else
{
@@ -140,16 +140,16 @@
userByName.setUpdateBy("sync");
sysUserMapper.updateUser(userByName);
updatedCount++;
- log.info("鏇存柊宸插瓨鍦ㄧ敤鎴峰悕鐨勭敤鎴�: {} ({}), 璁剧疆oaUserId: {}",
- dto.getNickName(), dto.getUserName(), dto.getOaUserId());
+// log.info("鏇存柊宸插瓨鍦ㄧ敤鎴峰悕鐨勭敤鎴�: {} ({}), 璁剧疆oaUserId: {}",
+// dto.getNickName(), dto.getUserName(), dto.getOaUserId());
}
else
{
// 鍒涘缓鏂扮敤鎴�
createNewUser(dto, deptId);
createdCount++;
- log.info("鍒涘缓鏂扮敤鎴�: {} ({}), oaUserId: {}, deptId: {}",
- dto.getNickName(), dto.getUserName(), dto.getOaUserId(), deptId);
+// log.info("鍒涘缓鏂扮敤鎴�: {} ({}), oaUserId: {}, deptId: {}",
+// dto.getNickName(), dto.getUserName(), dto.getOaUserId(), deptId);
}
}
}
@@ -163,7 +163,7 @@
String message = String.format("鍚屾瀹屾垚锛佸垱寤虹敤鎴�: %d, 鏇存柊鐢ㄦ埛: %d, 璺宠繃: %d, 澶辫触: %d",
createdCount, updatedCount, skippedCount, errorCount);
- log.info(message);
+// log.info(message);
Map<String, Object> result = new HashMap<>();
result.put("created", createdCount);
@@ -227,6 +227,10 @@
{
existingUser.setCanViewAllConsult(dto.getCanViewAllConsult());
}
+ if (StringUtils.isNotEmpty(dto.getCanCreateTask()))
+ {
+ existingUser.setCanCreateTask(dto.getCanCreateTask());
+ }
// 鍚屾浼佷笟寰俊鐢ㄦ埛ID
if (StringUtils.isNotEmpty(dto.getOaWeixinUserId()))
{
@@ -253,6 +257,10 @@
{
newUser.setCanViewAllConsult(dto.getCanViewAllConsult());
}
+ if (StringUtils.isNotEmpty(dto.getCanCreateTask()))
+ {
+ newUser.setCanCreateTask(dto.getCanCreateTask());
+ }
// 璁剧疆浼佷笟寰俊鐢ㄦ埛ID
if (StringUtils.isNotEmpty(dto.getOaWeixinUserId()))
--
Gitblit v1.9.1