From d53ba210266e8b94761e1d688326ad8525242f3b Mon Sep 17 00:00:00 2001
From: chen-xin-zhi <3588068430@qq.com>
Date: Mon, 14 Jul 2025 08:49:30 +0800
Subject: [PATCH] --------

---
 .../userInfo/impl/UserInfoServiceImpl.java    |  2 +-
 .../UserPerformanceSummaryServiceImpl.java    |  9 ++++++---
 src/main/resources/application-caozhe.yml     | 20 +++++++++----------
 src/main/resources/application.yml            |  2 +-
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java b/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java
index 96bb630..89332de 100644
--- a/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java
+++ b/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java
@@ -13,6 +13,7 @@ import com.greenorange.promotion.constant.SystemConstant;
 import com.greenorange.promotion.constant.UserConstant;
 import com.greenorange.promotion.exception.ThrowUtils;
 import com.greenorange.promotion.mapper.UserInfoMapper;
+import com.greenorange.promotion.mapper.UserPerformanceSummaryMapper;
 import com.greenorange.promotion.model.dto.advancementApply.AdvancementApplyApproveRequest;
 import com.greenorange.promotion.model.dto.projectCommission.ProjectCommissionAddRequest;
 import com.greenorange.promotion.model.dto.userInfo.*;
@@ -381,7 +382,6 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo>
         // 添加用户绩效记录
         UserPerformanceSummary userPerformanceSummary = UserPerformanceSummary.builder().userId(myUserInfo.getId()).build();
         userPerformanceSummaryService.save(userPerformanceSummary);
-
         // 更新上级主管用户的员工数量和经理用户的员工数量
         updateParentUserInfoEmpCount(myUserInfo.getId(), UserRoleEnum.STAFF);
 
diff --git a/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserPerformanceSummaryServiceImpl.java b/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserPerformanceSummaryServiceImpl.java
index 585c5ae..7696781 100644
--- a/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserPerformanceSummaryServiceImpl.java
+++ b/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserPerformanceSummaryServiceImpl.java
@@ -10,6 +10,7 @@ import com.greenorange.promotion.common.PageRequest;
 import com.greenorange.promotion.constant.CommonConstant;
 import com.greenorange.promotion.constant.SystemConstant;
 import com.greenorange.promotion.constant.UserConstant;
+import com.greenorange.promotion.mapper.UserInfoMapper;
 import com.greenorange.promotion.model.dto.CommonStringRequest;
 import com.greenorange.promotion.model.dto.userPerformanceSummary.*;
 import com.greenorange.promotion.model.entity.*;
@@ -21,6 +22,7 @@ import com.greenorange.promotion.service.common.CommonService;
 import com.greenorange.promotion.service.course.CoursePromotionCommissionPendingService;
 import com.greenorange.promotion.service.userInfo.EmployeePromotionRecordsService;
 import com.greenorange.promotion.service.userInfo.UserInfoService;
+import com.greenorange.promotion.service.userInfo.UserMainInfoService;
 import com.greenorange.promotion.service.userInfo.UserPerformanceSummaryService;
 import com.greenorange.promotion.mapper.UserPerformanceSummaryMapper;
 import com.greenorange.promotion.utils.SqlUtils;
@@ -65,7 +67,7 @@ public class UserPerformanceSummaryServiceImpl extends ServiceImpl<UserPerforman
 
 
     @Resource
-    private UserInfoService userInfoService;
+    private UserInfoMapper userInfoMapper;
 
 
     @Resource
@@ -279,8 +281,9 @@ public class UserPerformanceSummaryServiceImpl extends ServiceImpl<UserPerforman
         Integer monthRefundCount;
         BigDecimal monthRefundAmount;
         Integer monthPromotionCount;
-
-        List<UserInfo> userInfoList = commonService.findByFieldEqTargetField(UserInfo::getUserRole, UserConstant.SUPERVISOR_ROLE, userInfoService);
+        LambdaQueryWrapper<UserInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(UserInfo::getUserRole, UserConstant.SUPERVISOR_ROLE);
+        List<UserInfo> userInfoList = userInfoMapper.selectList(queryWrapper);
         List<UserPerformanceSummary> userPerformanceSummaryList = commonService.findByFieldInTargetField(userInfoList, this, UserInfo::getId, UserPerformanceSummary::getUserId);
         superCount = userPerformanceSummaryList.size();
         for (UserPerformanceSummary userPerformanceSummary : userPerformanceSummaryList) {
diff --git a/src/main/resources/application-caozhe.yml b/src/main/resources/application-caozhe.yml
index 3d152af..828505f 100644
--- a/src/main/resources/application-caozhe.yml
+++ b/src/main/resources/application-caozhe.yml
@@ -1,19 +1,19 @@
 spring:
   datasource:
-#    driver-class-name: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://27.30.77.229:3306/qingcheng_caozhe?serverTimezone=Asia/Shanghai
-#    username: qingcheng
-#    password: Qc@8ls2jf
-#    hikari:
-#      maximum-pool-size: 300
-#      max-lifetime: 120000
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://43.143.28.121:3306/easybbs?serverTimezone=Asia/Shanghai
-    username: easybbs
-    password: root
+    url: jdbc:mysql://27.30.77.229:3306/qingcheng_caozhe?serverTimezone=Asia/Shanghai
+    username: qingcheng
+    password: Qc@8ls2jf
     hikari:
       maximum-pool-size: 300
       max-lifetime: 120000
+#    driver-class-name: com.mysql.cj.jdbc.Driver
+#    url: jdbc:mysql://43.143.28.121:3306/easybbs?serverTimezone=Asia/Shanghai
+#    username: easybbs
+#    password: root
+#    hikari:
+#      maximum-pool-size: 300
+#      max-lifetime: 120000
 
 
   rabbitmq:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ad9a171..3a0f5e6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
+    active: caozhe