档案销毁人列表

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchivesAutoController.java

@@ -541,8 +541,8 @@ public class ArchivesAutoController extends BladeController {
 	@GetMapping("/getArchiveDestroyUser")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "获取档案销毁人列表", notes = "获取档案销毁人列表")
-	public R getArchiveDestroyUser(){
-		return R.data(archivesAutoService.getArchiveDestroyUser());
+	public R getArchiveDestroyUser(Long projectId){
+		return R.data(archivesAutoService.getArchiveDestroyUser(projectId));
 	}
 
 

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.java

@@ -130,9 +130,9 @@ public interface ArchivesAutoMapper extends BaseMapper<ArchivesAuto> {
 
 	List<DictBiz> getCarrierTypeByDict();
 
-	void batchDestroyByIds(@Param("ids")List<String> ids);
+	void batchDestroyByIds(@Param("ids")List<String> ids,@Param("userId") Long userId);
 
-	List<User> getArchiveDestroyUser();
+	List<User> getArchiveDestroyUser(@Param("projectId") Long projectId);
 
     String getUserRoleName(@Param("projectId") Long projectId, @Param("contractId") Long contractId, @Param("userId") Long userId);
 

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -919,7 +919,7 @@
     </select>
     <select id="getArchiveDestroyUser" resultType="org.springblade.system.user.entity.User">
         SELECT id,real_name  FROM blade_user WHERE id IN (SELECT uaa.update_user  FROM u_archives_auto uaa
-                                                          WHERE uaa.is_deleted = 1 AND  uaa.is_destroy = 1
+                                                          WHERE uaa.is_deleted = 1 AND  uaa.is_destroy = 1 and project_id = #{projectId}
                                                           GROUP BY uaa.update_user )
     </select>
     <select id="getAllArchiveFileSize" resultType="java.lang.Long">
@@ -939,7 +939,7 @@
         </foreach>
     </update>
     <update id="batchDestroyByIds">
-        update u_archives_auto set is_deleted = 1 ,is_destroy = 1 where
+        update u_archives_auto set is_deleted = 1 ,is_destroy = 1 ,update_user = #{userId} where
         id in
         <foreach collection="ids" item="id" open="(" separator="," close=")">
             #{id}

blade-service/blade-archive/src/main/java/org/springblade/archive/service/IArchivesAutoService.java

@@ -86,7 +86,7 @@ public interface IArchivesAutoService extends BaseService<ArchivesAuto> {
 
 	void archiveAutoMethodThread(Long projectId, Long contractId, Long nodeId);
 
-	List<User> getArchiveDestroyUser();
+	List<User> getArchiveDestroyUser(Long projectId);
 
 	List<Map<String, List<Map<String, String>>>> getArchivesCabinet(ArchivesAutoVO archivesAuto);
 

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -53,6 +53,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.FileUtil;
 import org.springblade.core.tool.utils.Func;
@@ -771,7 +772,8 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			archiveFileClient.batchDeleteArchiveFile(collect);
 		}
 		//销毁案卷
-		baseMapper.batchDestroyByIds(list);
+		Long userId = SecureUtil.getUserId();
+		baseMapper.batchDestroyByIds(list,userId);
 	}
 
 
@@ -2077,8 +2079,8 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 	}
 
 	@Override
-	public List<User> getArchiveDestroyUser() {
-		return autoMapper.getArchiveDestroyUser();
+	public List<User> getArchiveDestroyUser(Long projectId) {
+		return autoMapper.getArchiveDestroyUser(projectId);
 	}