|
@@ -53,6 +53,7 @@ import org.springblade.core.mp.support.Query;
|
|
import org.springblade.core.oss.model.BladeFile;
|
|
import org.springblade.core.oss.model.BladeFile;
|
|
import org.springblade.core.secure.BladeUser;
|
|
import org.springblade.core.secure.BladeUser;
|
|
import org.springblade.core.secure.utils.AuthUtil;
|
|
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.api.R;
|
|
import org.springblade.core.tool.utils.FileUtil;
|
|
import org.springblade.core.tool.utils.FileUtil;
|
|
import org.springblade.core.tool.utils.Func;
|
|
import org.springblade.core.tool.utils.Func;
|
|
@@ -771,7 +772,8 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
|
|
archiveFileClient.batchDeleteArchiveFile(collect);
|
|
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
|
|
@Override
|
|
- public List<User> getArchiveDestroyUser() {
|
|
|
|
- return autoMapper.getArchiveDestroyUser();
|
|
|
|
|
|
+ public List<User> getArchiveDestroyUser(Long projectId) {
|
|
|
|
+ return autoMapper.getArchiveDestroyUser(projectId);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|