From 7b00d67cf7c93156f849c924d7cca3404cac78b0 Mon Sep 17 00:00:00 2001
From: zt <seesawgzz@gmail.com>
Date: Mon, 29 Sep 2025 15:53:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=BD=E5=B7=A5=E4=BA=A7=E5=80=BC=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../out/mapper/OutConstructionValueMapper.java |  8 ++++----
 .../impl/BusProjectTeamMemberServiceImpl.java  | 18 ++++++++++++++++++
 .../controller/TransferDataController.java     |  2 ++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/mapper/OutConstructionValueMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/mapper/OutConstructionValueMapper.java
index cfdc018f..b92f97a1 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/mapper/OutConstructionValueMapper.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/mapper/OutConstructionValueMapper.java
@@ -19,9 +19,9 @@ public interface OutConstructionValueMapper extends BaseMapperPlus<OutConstructi
 
     @Select({
         "<script>",
-        "select sum(out_value) from out_construction_value where project_id = #{projectId} and audit_status = 'finish'",
+        "select sum(v.out_value) from out_construction_value v left join out_construction_value_range r on v.range_id = r.id where v.project_id = #{projectId} and r.audit_status = 'finish'",
         "<if test='month != null and month != \"\"'>",
-        "and DATE_FORMAT(report_date, '%Y-%m') = #{month}",
+        "and DATE_FORMAT(v.report_date, '%Y-%m') = #{month}",
         "</if>",
         "</script>"
     })
@@ -29,9 +29,9 @@ public interface OutConstructionValueMapper extends BaseMapperPlus<OutConstructi
 
     @Select({
         "<script>",
-        "select sum(owner_value) from out_construction_value where project_id = #{projectId} and audit_status = 'finish'",
+        "select sum(v.owner_value) from out_construction_value v left join out_construction_value_range r on v.range_id = r.id where v.project_id = #{projectId} and r.audit_status = 'finish'",
         "<if test='month != null and month != \"\"'>",
-        "and DATE_FORMAT(report_date, '%Y-%m') = #{month}",
+        "and DATE_FORMAT(v.report_date, '%Y-%m') = #{month}",
         "</if>",
         "</script>"
     })
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
index 6a8b82c5..70c90ac3 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
@@ -245,6 +245,24 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
                 .set(SubConstructionUser::getTeamName, projectTeam.getTeamName());
             constructionUserService.update(constructionUserLuw);
         }
+
+        if(StrUtil.isNotBlank(req.getPostId()) &&  !oldProjectTeamMember.getPostId().equals(req.getPostId())){
+            //设置基础角色 先清空已有角色
+            userRoleMapper.delete(Wrappers.<SysUserRole>lambdaQuery()
+                .eq(SysUserRole::getUserId, constructionUser.getSysUserId())
+                .eq(SysUserRole::getProjectId, req.getProjectId())
+                .in(SysUserRole::getRoleId, Arrays.asList(2L, 3L))
+            );
+            //再添加分配角色
+            Long roleId = "0".equals(req.getPostId()) ? 2L : 3L;
+            SysUserRole sysUserRole = new SysUserRole();
+            sysUserRole.setUserId(constructionUser.getSysUserId());
+            sysUserRole.setRoleId(roleId);
+            sysUserRole.setProjectId(req.getProjectId());
+            userRoleMapper.insert(sysUserRole);
+
+            roleService.cleanOnlineUser(Collections.singletonList(constructionUser.getSysUserId()));
+        }
         // 操作数据库
         return this.updateById(projectTeamMember);
     }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/controller/TransferDataController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/controller/TransferDataController.java
index 9d429ea0..81fa4dc9 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/controller/TransferDataController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/controller/TransferDataController.java
@@ -1,5 +1,6 @@
 package org.dromara.transferData.controller;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import jakarta.annotation.Resource;
@@ -40,6 +41,7 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/transferData")
 @Slf4j
+@SaIgnore
 public class TransferDataController {
 
     @Resource