From b6cd71911ca412fdc87f2e3bea3880fd2dc9de12 Mon Sep 17 00:00:00 2001
From: Jinyuanyuan <1197651512@qq.com>
Date: Tue, 28 May 2024 09:43:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=81=94=E7=B3=BB=E4=BA=BA?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/modules/huzhou/dao/HuzhouProjectinfoMapper.java | 2 +-
 .../service/impl/HuzhouFieldchangehistoryServiceImpl.java | 8 ++++++++
 .../huzhou/service/impl/HuzhouProjectinfoServiceImpl.java | 3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouProjectinfoMapper.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouProjectinfoMapper.java
index e059e12..79a0d6e 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouProjectinfoMapper.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouProjectinfoMapper.java
@@ -24,7 +24,7 @@ public interface HuzhouProjectinfoMapper extends BaseMapper<HuzhouProjectinfo> {
      * @param info 查询条件
      * @return List<HuzhouProjectinfo>
      */
-    List<HuzhouProjectinfo> getProjectInfoPageList(HuzhouProjectinfo info);
+    List<HuzhouProjectinfo> getProjectInfoPageList(@Param("info") HuzhouProjectinfo info);
 
     /**
      * 获取项目信息和子项目信息，支持分页
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java
index a58faef..81e53e9 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java
@@ -1,6 +1,7 @@
 package com.easy.admin.modules.huzhou.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.easy.admin.auth.model.SysRole;
@@ -61,6 +62,9 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl<HuzhouField
     private SysDictService sysDictService;
     @Autowired
     private TaskService taskService;
+
+    @Autowired
+    private HuzhouUserprojectMapper userprojectMapper;
     @Override
     public void submitChangeFieldManage(MultipartFile[] multipartFiles, String projectid, String fieldValue, HuzhouProjectinfo newProjectinfo) throws Exception {
         String id = UUID.randomUUID().toString().replace("-","");
@@ -227,6 +231,10 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl<HuzhouField
                     //newValue 是sysUser的id
                     SysUser sysUserByUserName = userService.getById(newValue);
                     newProjectinfo.setPhone(sysUserByUserName.getPhoneNumber());
+                    LambdaUpdateWrapper<HuzhouUserproject> queryWrapper2 = new LambdaUpdateWrapper<>();
+                    queryWrapper2.eq(HuzhouUserproject::getProjectId,projectid).eq(HuzhouUserproject::getUserId,oldvalue);
+                    queryWrapper2.set(HuzhouUserproject::getUserId,newValue);
+                    userprojectMapper.update(null,queryWrapper2);
                 }
                 projectinfoMapper.updateById(newProjectinfo);
             }
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
index 0a1e4df..d29c3c4 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
@@ -446,7 +446,8 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
     @Override
     public void batchdownloadProject(HttpServletResponse response, HuzhouProjectinfo projectinfo) {
         //查询主项目的信息
-        List<HuzhouProjectinfo> projectinfoList = projectinfoMapper.getProjectInfoPageList(projectinfo);
+        ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectinfo);
+        List<HuzhouProjectinfo> projectinfoList = projectinfoMapper.getProjectInfoPageList(projectInfoAuthSelect);
         for(int i =0;i<projectinfoList.size();i++){
             HuzhouProjectinfo huzhouProjectinfo = projectinfoList.get(i);
             //查询是否有子项目