diff --git a/capability/src/main/java/com/sdm/capability/dao/FlowMapper.java b/capability/src/main/java/com/sdm/capability/dao/FlowMapper.java
index 38653bd5..7d11d39a 100644
--- a/capability/src/main/java/com/sdm/capability/dao/FlowMapper.java
+++ b/capability/src/main/java/com/sdm/capability/dao/FlowMapper.java
@@ -18,11 +18,11 @@ public interface FlowMapper {
 
     int delFlowTemplateById(@Param("id") long id);
 
-    List<CapFlowTemplate> getFlowTemplateByRoute(@Param("route") String route, @Param("company") String company);
+    List<CapFlowTemplate> getFlowTemplateByRoute(@Param("route") String route, @Param("company") Long company);
 
     CapFlowTemplate getFlowTemplateById(Long id);
 
-    int getFlowTemplateByNameCount(@Param("name") String name, @Param("company") String company);
+    int getFlowTemplateByNameCount(@Param("name") String name, @Param("company") Long company);
 
     int batchDelFlow(@Param("flowTemplateList") List<CapFlowTemplate> capFlowTemplateList);
 
diff --git a/capability/src/main/java/com/sdm/capability/service/impl/FlowServiceImpl.java b/capability/src/main/java/com/sdm/capability/service/impl/FlowServiceImpl.java
index c3ffdf5d..09c3b561 100644
--- a/capability/src/main/java/com/sdm/capability/service/impl/FlowServiceImpl.java
+++ b/capability/src/main/java/com/sdm/capability/service/impl/FlowServiceImpl.java
@@ -50,12 +50,12 @@ public class FlowServiceImpl implements FlowService {
     @Override
     public SdmResponse addFlowTemplate(String name, String creator, String creatorName, String path, byte type,
                                        String imagePath, String description, String updater, int approveStatus, String englishName) {
-        int count = flowMapper.getFlowTemplateByNameCount(name, ThreadLocalContext.getCompany());
+        int count = flowMapper.getFlowTemplateByNameCount(name, ThreadLocalContext.getTenantId());
         if (count > 0) {
             return SdmResponse.failed("流程模板名称已存在");
         }
         if (flowMapper.addFlowTemplate(name, creator, path, type, imagePath, description, approveStatus, englishName) > 0) {
-            redisUtil.del(FLOW_TEMPLATE_PATH + ThreadLocalContext.getCompany());
+            redisUtil.del(FLOW_TEMPLATE_PATH + String.valueOf(ThreadLocalContext.getTenantId()));
             return SdmResponse.success();
         } else {
             return SdmResponse.failed("新增流程模板失败！");
@@ -74,12 +74,12 @@ public class FlowServiceImpl implements FlowService {
 
     @Override
     public List<CapFlowTemplate> getFlowTemplateByRoute(String route) {
-        return flowMapper.getFlowTemplateByRoute(route, ThreadLocalContext.getCompany());
+        return flowMapper.getFlowTemplateByRoute(route, ThreadLocalContext.getTenantId());
     }
 
     @Override
     public SdmResponse getFlowTemplatePth() {
-        String company = ThreadLocalContext.getCompany();
+        String company = String.valueOf(ThreadLocalContext.getTenantId());
         String path = Tools.getRootPath(rootPath, company) + "/Flow/templateFlowLib";
         FileResp fileResp = new FileResp(path);
         if (ObjectUtils.isEmpty(redisUtil.get(FLOW_TEMPLATE_PATH + company))) {
@@ -93,7 +93,7 @@ public class FlowServiceImpl implements FlowService {
 
     @Override
     public SdmResponse updateFlowTemplatePath() {
-        String company = ThreadLocalContext.getCompany();
+        String company = String.valueOf(ThreadLocalContext.getTenantId());
         redisUtil.del(FLOW_TEMPLATE_PATH + company);
         return SdmResponse.success();
     }
@@ -101,7 +101,7 @@ public class FlowServiceImpl implements FlowService {
     @Override
     public SdmResponse delFlowTemplateByDir(DelFlowTemplateByDirReq req) {
         log.info(ThreadLocalContext.getJobNumber() + " delFlowTemplateByDir");
-        String path = Tools.getRootPath(rootPath, ThreadLocalContext.getCompany()) + req.getPath();
+        String path = Tools.getRootPath(rootPath, String.valueOf(ThreadLocalContext.getTenantId())) + req.getPath();
         File dir = new File(path);
         if (!dir.exists() || !dir.isDirectory()) {
             return SdmResponse.failed("文件夹不存在");
@@ -109,12 +109,12 @@ public class FlowServiceImpl implements FlowService {
             Tools.reverseDelFiles(dir);
         }
         if (!new File(path).exists()) {
-            List<CapFlowTemplate> capFlowTemplateList = flowMapper.getFlowTemplateByRoute(req.getPath(), ThreadLocalContext.getCompany());
+            List<CapFlowTemplate> capFlowTemplateList = flowMapper.getFlowTemplateByRoute(req.getPath(), ThreadLocalContext.getTenantId());
             if(capFlowTemplateList != null && capFlowTemplateList.size()>0){
                 if (flowMapper.batchDelFlow(capFlowTemplateList) <= 0) {
                     return SdmResponse.failed("删除文件夹");
                 } else {
-                    redisUtil.del(FLOW_TEMPLATE_PATH + ThreadLocalContext.getCompany());
+                    redisUtil.del(FLOW_TEMPLATE_PATH + String.valueOf(ThreadLocalContext.getTenantId()));
                 }
             }
         }
@@ -138,7 +138,7 @@ public class FlowServiceImpl implements FlowService {
         if(count > 0) {
             name = name + "-V" + count;
         }
-        String companyRootPath = Tools.getRootPath(rootPath, ThreadLocalContext.getCompany());
+        String companyRootPath = Tools.getRootPath(rootPath, String.valueOf(ThreadLocalContext.getTenantId()));
         String sourcePath = companyRootPath + req.getParentPath() + File.separator + req.getName();
         String targetPath = companyRootPath + req.getParentPath() + File.separator + name;
         File sourceFile = new File(sourcePath);
@@ -149,7 +149,7 @@ public class FlowServiceImpl implements FlowService {
         }
         sourceFile.renameTo(targetFile);
         flowMapper.updateTemplateName(name, req.getName(), ThreadLocalContext.getJobNumber());
-        redisUtil.del(FLOW_TEMPLATE_PATH + ThreadLocalContext.getCompany());
+        redisUtil.del(FLOW_TEMPLATE_PATH + String.valueOf(ThreadLocalContext.getTenantId()));
         return SdmResponse.success(new DeprecatedTemplateRsp(id, name));
     }
 
@@ -160,7 +160,7 @@ public class FlowServiceImpl implements FlowService {
         if(flowMapper.updatePatentApplication(id, isPatentApplication, ThreadLocalContext.getJobNumber()) <= 0) {
             return SdmResponse.failed("更新专利失败");
         }
-        redisUtil.del(FLOW_TEMPLATE_PATH + ThreadLocalContext.getCompany());
+        redisUtil.del(FLOW_TEMPLATE_PATH + String.valueOf(ThreadLocalContext.getTenantId()));
         return SdmResponse.success();
     }
 
@@ -206,7 +206,7 @@ public class FlowServiceImpl implements FlowService {
     @Override
     public SdmResponse updateData(String path) {
         BaseData baseData = new FlowTemplateNode(IData.DATA_STATUS.WORK, path);
-        String companyRootPath = Tools.getRootPath(rootPath, ThreadLocalContext.getCompany());
+        String companyRootPath = Tools.getRootPath(rootPath, String.valueOf(ThreadLocalContext.getTenantId()));
         if(baseData.save(companyRootPath)) {
             return SdmResponse.success();
         } else {
diff --git a/common/src/main/java/com/sdm/common/entity/pojo/BaseEntity.java b/common/src/main/java/com/sdm/common/entity/pojo/BaseEntity.java
index c2df4909..27cd0046 100644
--- a/common/src/main/java/com/sdm/common/entity/pojo/BaseEntity.java
+++ b/common/src/main/java/com/sdm/common/entity/pojo/BaseEntity.java
@@ -6,9 +6,9 @@ import lombok.Data;
 public class BaseEntity {
     private long id;
     private String company;
-    private String creator;
+    private Long creator;
     private String createTime;
-    private String updater;
+    private Long updater;
     private String updateTime;
-    private String tenantId;
+    private Long tenantId;
 }
diff --git a/common/src/main/java/com/sdm/common/entity/pojo/project/ProjectBase.java b/common/src/main/java/com/sdm/common/entity/pojo/project/ProjectBase.java
index 438134b3..915e8b21 100644
--- a/common/src/main/java/com/sdm/common/entity/pojo/project/ProjectBase.java
+++ b/common/src/main/java/com/sdm/common/entity/pojo/project/ProjectBase.java
@@ -14,5 +14,5 @@ public class ProjectBase extends BaseEntity {
     private String currentNodeId;
     private String beginTime;
     private String endTime;
-    private String tenantId;
+    private Long tenantId;
 }
diff --git a/data/src/main/java/com/sdm/data/service/impl/SystemFileIDataFileServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/SystemFileIDataFileServiceImpl.java
index 3b0ea7b6..1288e43e 100644
--- a/data/src/main/java/com/sdm/data/service/impl/SystemFileIDataFileServiceImpl.java
+++ b/data/src/main/java/com/sdm/data/service/impl/SystemFileIDataFileServiceImpl.java
@@ -84,7 +84,7 @@ public class SystemFileIDataFileServiceImpl implements IDataFileService {
         if (req.getType() == 0) {
             // 相对路径
             // 检查父文件夹权限
-            String path = Tools.getRootPath(rootPath, ThreadLocalContext.getCompany());
+            String path = Tools.getRootPath(rootPath, String.valueOf(ThreadLocalContext.getTenantId()));
             if (parentPath != null && parentPath.length() > 0)
                 path = path + File.separator + parentPath;
 
@@ -92,7 +92,7 @@ public class SystemFileIDataFileServiceImpl implements IDataFileService {
             if (!parentDir.exists() || !parentDir.isDirectory()) {
                 return SdmResponse.failed("文件夹不存在");
             } else {
-                byte perm = getFileUserVisitPermission(parentPath, "", null, ThreadLocalContext.getCompany());
+                byte perm = getFileUserVisitPermission(parentPath, "", null, String.valueOf(ThreadLocalContext.getTenantId()));
                 if ((perm & PermConstants.WRITE_PERM) == 0) {
                     return SdmResponse.failed(ResultCode.NO_PERMISSION);
                 }
@@ -354,11 +354,11 @@ public class SystemFileIDataFileServiceImpl implements IDataFileService {
         }
         if (req.getType() == 0) {
             // 0相对路径
-            byte permission = getFileUserVisitPermission(parentPath, dirName, null, ThreadLocalContext.getCompany());
+            byte permission = getFileUserVisitPermission(parentPath, dirName, null, String.valueOf(ThreadLocalContext.getTenantId()));
             if ((permission & PermConstants.DEL_PERM) == 0) {
                 return SdmResponse.failed(ResultCode.NO_PERMISSION);
             }
-            String companyRootPath = Tools.getRootPath(rootPath, ThreadLocalContext.getCompany());
+            String companyRootPath = Tools.getRootPath(rootPath, String.valueOf(ThreadLocalContext.getTenantId()));
             String path = companyRootPath;
             if (parentPath != null && parentPath.length() > 0)
                 path = path + File.separator + parentPath;
@@ -515,12 +515,12 @@ public class SystemFileIDataFileServiceImpl implements IDataFileService {
         }
         if (req.getType() == 0) {
             ComprehensivePermission comprehensivePermission = getFileUserVisitComprehensivePermission(parentPath, dirName, 
-                    ThreadLocalContext.getJobNumber(), ThreadLocalContext.getCompany(), (byte) 0, false, null);
+                    ThreadLocalContext.getJobNumber(), String.valueOf(ThreadLocalContext.getTenantId()), (byte) 0, false, null);
             byte permission = getFilePermission(comprehensivePermission);
             if ((permission & PermConstants.DEL_PERM) == 0) {
                 return SdmResponse.failed(ResultCode.NO_PERMISSION);
             }
-            String companyRootPath = Tools.getRootPath(rootPath, ThreadLocalContext.getCompany());
+            String companyRootPath = Tools.getRootPath(rootPath, String.valueOf(ThreadLocalContext.getTenantId()));
             String filePath = companyRootPath + File.separator + parentPath + File.separator + dirName;
             File file = new File(filePath);
             if (!file.exists()) {
@@ -618,9 +618,9 @@ public class SystemFileIDataFileServiceImpl implements IDataFileService {
         }
         String searchDir = req.getSearchDir();
         if (searchDir.length() > 0 && !searchDir.startsWith("/") && !searchDir.startsWith("\\")) {
-            searchDir = "'" + Tools.getRootPath(rootPath, ThreadLocalContext.getCompany()) + File.separator + searchDir + "'";
+            searchDir = "'" + Tools.getRootPath(rootPath, String.valueOf(ThreadLocalContext.getTenantId())) + File.separator + searchDir + "'";
         } else {
-            searchDir = "'" + Tools.getRootPath(rootPath, ThreadLocalContext.getCompany()) + searchDir + "'";
+            searchDir = "'" + Tools.getRootPath(rootPath, String.valueOf(ThreadLocalContext.getTenantId())) + searchDir + "'";
         }
         String findCmd = "find -L " + searchDir + " " + findType + " " + matchCondi + " -exec ls -ld {} \\;";
         log.info(findCmd);
@@ -658,7 +658,7 @@ public class SystemFileIDataFileServiceImpl implements IDataFileService {
      * @return
      */
     public FileBaseInfo getFileBaseInfo(String filePath) {
-        String absPath = Tools.getRootPath(rootPath, ThreadLocalContext.getCompany()) + File.separator + filePath;
+        String absPath = Tools.getRootPath(rootPath, String.valueOf(ThreadLocalContext.getTenantId())) + File.separator + filePath;
         File file = new File(absPath);
         if (!file.exists())
             return null;
@@ -746,7 +746,7 @@ public class SystemFileIDataFileServiceImpl implements IDataFileService {
             return SdmResponse.failed(ResultCode.VALIDATE_FAILED, "非法文件路径！");
         }
         Map<String, DataNode> map = new HashMap<>();
-        byte permission = getFileUserVisitPermission(strParentPath, strFileName, map, ThreadLocalContext.getCompany());
+        byte permission = getFileUserVisitPermission(strParentPath, strFileName, map, String.valueOf(ThreadLocalContext.getTenantId()));
         if ((permission & PermConstants.READ_PERM) == 0) {
             return SdmResponse.failed(ResultCode.NO_PERMISSION);
         } else {
@@ -766,7 +766,7 @@ public class SystemFileIDataFileServiceImpl implements IDataFileService {
                     String fileName = fileBaseInfo.getFileName();
                     ComprehensivePermission comprehensivePermission =
                             getFileUserVisitComprehensivePermission(parentPath, fileName, loginJobNumber,
-                                    ThreadLocalContext.getCompany(), (byte) 0, false, map);
+                                    String.valueOf(ThreadLocalContext.getTenantId()), (byte) 0, false, map);
                     fileBaseInfo.setStatus(comprehensivePermission.getFileStatus());
                     fileBaseInfo.setDataType(comprehensivePermission.getFileType());
                     perm = getFilePermission(comprehensivePermission);
@@ -784,7 +784,7 @@ public class SystemFileIDataFileServiceImpl implements IDataFileService {
      * @return
      */
     public List<FileBaseInfo> getDirectoryContents(String parentPath, String fileName, int isFilter) {
-        String companyRootPath = Tools.getRootPath(rootPath, ThreadLocalContext.getCompany());
+        String companyRootPath = Tools.getRootPath(rootPath, String.valueOf(ThreadLocalContext.getTenantId()));
         String path = companyRootPath;
         if (parentPath != null && parentPath.length() > 0)
             path = path + File.separator + parentPath;
@@ -847,7 +847,7 @@ public class SystemFileIDataFileServiceImpl implements IDataFileService {
     public SdmResponse queryFilePermValue(QueryFilePermValueReq req) {
         String strParentPath = req.getParentPath();
         String strFileName = req.getFileName();
-        byte perm = getFileUserVisitPermission(strParentPath, strFileName, null, ThreadLocalContext.getCompany());
+        byte perm = getFileUserVisitPermission(strParentPath, strFileName, null, String.valueOf(ThreadLocalContext.getTenantId()));
         return SdmResponse.success(perm);
     }
 
@@ -867,7 +867,7 @@ public class SystemFileIDataFileServiceImpl implements IDataFileService {
      * @return
      */
     public List<PermissionInfo> getFileRecordUserPermission(String parentPath, String fileName) {
-        String absParentPath = Tools.getRootPath(rootPath, ThreadLocalContext.getCompany());
+        String absParentPath = Tools.getRootPath(rootPath, String.valueOf(ThreadLocalContext.getTenantId()));
         ;
         if (parentPath != null && parentPath.length() != 0)
             absParentPath = absParentPath + File.separator + parentPath;
@@ -972,11 +972,11 @@ public class SystemFileIDataFileServiceImpl implements IDataFileService {
         if (req.getType() == 0) {
             String newName = req.getNewName();
 
-            byte permission = getFileUserVisitPermission(parentPath, oldName, null, ThreadLocalContext.getCompany());
+            byte permission = getFileUserVisitPermission(parentPath, oldName, null, String.valueOf(ThreadLocalContext.getTenantId()));
             if ((permission & PermConstants.WRITE_PERM) == 0) {
                 return SdmResponse.failed(ResultCode.NO_PERMISSION);
             }
-            String companyRootPath = Tools.getRootPath(rootPath, ThreadLocalContext.getCompany());
+            String companyRootPath = Tools.getRootPath(rootPath, String.valueOf(ThreadLocalContext.getTenantId()));
             String oldPath = companyRootPath + File.separator + parentPath + File.separator + oldName;
             String newPath = companyRootPath + File.separator + parentPath + File.separator + newName;
             File oldFile = new File(oldPath);
@@ -1026,7 +1026,7 @@ public class SystemFileIDataFileServiceImpl implements IDataFileService {
         String userId = req.getJobNumber();
         String userName = req.getUserName();
         String effectiveTime = req.getEffectiveTime();
-        String companyRootPath = Tools.getRootPath(rootPath, ThreadLocalContext.getCompany());
+        String companyRootPath = Tools.getRootPath(rootPath, String.valueOf(ThreadLocalContext.getTenantId()));
         String absParentPath = companyRootPath;
         if (parentPath != null && parentPath.length() != 0)
             absParentPath = absParentPath + File.separator + parentPath;
@@ -1185,7 +1185,7 @@ public class SystemFileIDataFileServiceImpl implements IDataFileService {
         if (StringUtils.isNotBlank(targetPath) && targetPath.contains("..")) {
             return SdmResponse.failed(ResultCode.VALIDATE_FAILED, "非法文件路径！");
         }
-        String companyRootPath = Tools.getRootPath(rootPath, ThreadLocalContext.getCompany());
+        String companyRootPath = Tools.getRootPath(rootPath, String.valueOf(ThreadLocalContext.getTenantId()));
         if (req.getType() == 0) {
             sourceFilePath = companyRootPath + "/" + sourceFilePath;
             targetPath = companyRootPath + "/" + targetPath;
@@ -1222,7 +1222,7 @@ public class SystemFileIDataFileServiceImpl implements IDataFileService {
             }
             oldPath = filePath;
         } else {
-            oldPath = Tools.getRootPath(rootPath, ThreadLocalContext.getCompany()) + File.separator + filePath;
+            oldPath = Tools.getRootPath(rootPath, String.valueOf(ThreadLocalContext.getTenantId())) + File.separator + filePath;
         }
         File oldFile = new File(oldPath);
         String newPath = oldFile.getParent() + File.separator + newName;
@@ -1285,7 +1285,7 @@ public class SystemFileIDataFileServiceImpl implements IDataFileService {
         }
         File file;
         if (req.getType() == 0) {
-            String path = Tools.getRootPath(rootPath, ThreadLocalContext.getCompany()) + File.separator + req.getPath();
+            String path = Tools.getRootPath(rootPath, String.valueOf(ThreadLocalContext.getTenantId())) + File.separator + req.getPath();
             file = new File(path);
             if (!file.exists()) {
                 log.error("文件不存在" + path);
@@ -1384,9 +1384,9 @@ public class SystemFileIDataFileServiceImpl implements IDataFileService {
                 return SdmResponse.failed(ResultCode.NO_PERMISSION, "没有上传权限");
             }
         } else {
-            savePath = Tools.getRootPath(rootPath, ThreadLocalContext.getCompany()) + File.separator + req.getPath();
+            savePath = Tools.getRootPath(rootPath, String.valueOf(ThreadLocalContext.getTenantId())) + File.separator + req.getPath();
         }
-        byte perm = getFileUserVisitPermission(savePath, "", null, ThreadLocalContext.getCompany());
+        byte perm = getFileUserVisitPermission(savePath, "", null, String.valueOf(ThreadLocalContext.getTenantId()));
         if ((perm & PermConstants.UPLOAD_PERM) == 0) {
             return SdmResponse.failed(ResultCode.NO_PERMISSION, "没有操作权限");
         }
@@ -1479,7 +1479,7 @@ public class SystemFileIDataFileServiceImpl implements IDataFileService {
         if (StringUtils.isNotBlank(targetPath) && targetPath.contains("..")) {
             return SdmResponse.failed(ResultCode.VALIDATE_FAILED, "非法文件路径！");
         }
-        String companyRootPath = Tools.getRootPath(rootPath, ThreadLocalContext.getCompany());
+        String companyRootPath = Tools.getRootPath(rootPath, String.valueOf(ThreadLocalContext.getTenantId()));
         if (req.getType() == 0) {
             sourceFilePath = companyRootPath + "/" + sourceFilePath;
             targetPath = companyRootPath + "/" + targetPath;
diff --git a/data/src/main/java/com/sdm/data/thread/ZipFilesThread.java b/data/src/main/java/com/sdm/data/thread/ZipFilesThread.java
index df7c038c..1ae11b24 100644
--- a/data/src/main/java/com/sdm/data/thread/ZipFilesThread.java
+++ b/data/src/main/java/com/sdm/data/thread/ZipFilesThread.java
@@ -34,7 +34,7 @@ public class ZipFilesThread implements Runnable {
     public void run() {
         ZipOutputStream zipOutputStream = null;
         String result = "SUCCESS";
-        String company = ThreadLocalContext.getCompany();
+        String company = String.valueOf(ThreadLocalContext.getTenantId());
         try {
             zipOutputStream = new ZipOutputStream(new FileOutputStream(zipFile));
             for (String path : paths) {
diff --git a/pbs/src/main/java/com/sdm/pbs/dao/PbsMapper.java b/pbs/src/main/java/com/sdm/pbs/dao/PbsMapper.java
index f642fd48..dd93b6f7 100644
--- a/pbs/src/main/java/com/sdm/pbs/dao/PbsMapper.java
+++ b/pbs/src/main/java/com/sdm/pbs/dao/PbsMapper.java
@@ -13,7 +13,7 @@ import java.util.Map;
 @Mapper
 public interface PbsMapper {
 
-    PbsRun getPbsRunById(@Param("runId") long runId, @Param("company") String company);
+    PbsRun getPbsRunById(@Param("runId") long runId, @Param("company") Long company);
 
     List<String> getPbsTaskStatus(@Param("runId") long runId);
 
@@ -27,20 +27,20 @@ public interface PbsMapper {
                                       @Param("statuses") List<String> statuses, @Param("jobNumber") String jobNumber,
                                       @Param("taskId") String taskId, @Param("projectName") String projectName,
                                       @Param("phaseName") String phaseName, @Param("disciplineName") String disciplineName,
-                                      @Param("runName") String runName, @Param("company") String company);
+                                      @Param("runName") String runName, @Param("company") Long company);
 
     List<PbsTaskInfo> getPbsTaskList(@Param("taskName") String taskName, @Param("types") List<String> types,
                                      @Param("statuses") List<String> statuses, @Param("jobNumber") String jobNumber,
                                      @Param("taskId") String taskId, @Param("projectName") String projectName,
                                      @Param("phaseName") String phaseName, @Param("disciplineName") String disciplineName,
-                                     @Param("runName") String runName, @Param("company") String company, @Param("pos") int pos, @Param("limit") int limit);
+                                     @Param("runName") String runName, @Param("company") Long company, @Param("pos") int pos, @Param("limit") int limit);
 
     @MapKey("projectName")
     List<Map> getPbsTaskCountByProject(@Param("taskName") String taskName, @Param("types") List<String> types,
                                        @Param("statuses") List<String> statuses, @Param("jobNumber") String jobNumber,
                                        @Param("taskId") String taskId, @Param("projectName") String projectName,
                                        @Param("phaseName") String phaseName, @Param("disciplineName") String disciplineName,
-                                       @Param("runName") String runName, @Param("company") String company);
+                                       @Param("runName") String runName, @Param("company") Long company);
 
     int addPbsFlowNode(@Param("flowNode") PbsFlowNode flowNode);
 
@@ -52,9 +52,9 @@ public interface PbsMapper {
 
     PbsFlowNode getFlowNodeById(@Param("flowNodeId") long flowNodeId);
 
-    int updateRunStatus(@Param("runId") long runId, @Param("status") int status, @Param("updater") String updater);
+    int updateRunStatus(@Param("runId") long runId, @Param("status") int status, @Param("updater") Long updater);
 
-    int updateFlowNodeStatus(@Param("flowNodeId") long flowNodeId, @Param("status") int status, @Param("updater") String updater);
+    int updateFlowNodeStatus(@Param("flowNodeId") long flowNodeId, @Param("status") int status, @Param("updater") Long updater);
 
     List<PbsFlowNode> getChildFlowNode(@Param("flowNodeId") long flowNodeId);
 
@@ -70,7 +70,7 @@ public interface PbsMapper {
 
     List<PbsTask> getPbsTaskByFlowNodeId(@Param("flowNodeId") long flowNodeId);
 
-    int updatePbsTaskRawId(@Param("rawId") String rawId, @Param("taskName") String taskName, @Param("updater") String updater);
+    int updatePbsTaskRawId(@Param("rawId") String rawId, @Param("taskName") String taskName, @Param("updater") Long updater);
 
     int updatePbsTaskByPbs(PbsTask pbsTask);
 
@@ -80,7 +80,7 @@ public interface PbsMapper {
 
     int updateTotalTime(@Param("totalTime") String totalTime, @Param("pbsTaskId") String pbsTaskId);
 
-    int updatePbsTaskStatus(@Param("status") String status, @Param("taskId") String taskId, @Param("updater") String updater);
+    int updatePbsTaskStatus(@Param("status") String status, @Param("taskId") String taskId, @Param("updater") Long updater);
 
     List<PbsFlowNode> getFlowNodeByNames(@Param("runId") long runId, @Param("flowNodeNames") List<String> flowNodeNames);
 
@@ -95,5 +95,5 @@ public interface PbsMapper {
     PbsRunResult getRunResultByEnglishName(@Param("runId") long runId, @Param("englishName") String englishName);
 
     int updateRunResultByEnglishName(@Param("runId") long runId, @Param("englishName") String englishName, @Param("value") String value,
-                                           @Param("status") byte status,  @Param("risk") byte risk, @Param("updater") String updater);
+                                           @Param("status") byte status,  @Param("risk") byte risk, @Param("updater") Long updater);
 }
diff --git a/pbs/src/main/java/com/sdm/pbs/dao/ProjectMapper.java b/pbs/src/main/java/com/sdm/pbs/dao/ProjectMapper.java
index d80a1d53..2de01bf8 100644
--- a/pbs/src/main/java/com/sdm/pbs/dao/ProjectMapper.java
+++ b/pbs/src/main/java/com/sdm/pbs/dao/ProjectMapper.java
@@ -10,17 +10,17 @@ import java.util.List;
 @Mapper
 public interface ProjectMapper {
 
-    List<ProjectNodeBase> getNodeBaseChildren(@Param("parentNodeId") long parentNodeId, @Param("parentNodeLevel") int parentNodeLevel, @Param("company") String company);
+    List<ProjectNodeBase> getNodeBaseChildren(@Param("parentNodeId") long parentNodeId, @Param("parentNodeLevel") int parentNodeLevel, @Param("company") Long company);
 
-    List<TaskBase> getTaskByNodeId(@Param("nodeBaseId") long nodeBaseId, @Param("company") String company, @Param("userId") String userId);
+    List<TaskBase> getTaskByNodeId(@Param("nodeBaseId") long nodeBaseId, @Param("company") Long company, @Param("userId") Long userId);
 
-    int updateProjectNodeExeStatus(@Param("nodeBaseId") long nodeBaseId, @Param("exeStatus") int exeStatus, @Param("updater") String updater, @Param("company") String company);
+    int updateProjectNodeExeStatus(@Param("nodeBaseId") long nodeBaseId, @Param("exeStatus") int exeStatus, @Param("updater") Long updater, @Param("company") Long company);
 
-    int updateProjectNodeStatus(@Param("nodeBaseId") long nodeBaseId, @Param("status") int status, @Param("updater") String updater, @Param("company") String company);
+    int updateProjectNodeStatus(@Param("nodeBaseId") long nodeBaseId, @Param("status") int status, @Param("updater") Long updater, @Param("company") Long company);
 
-    int updateProjectNodeFinishTime(@Param("nodeBaseId") long nodeBaseId, @Param("finishTime") String finishTime, @Param("updater") String updater, @Param("company") String company);
+    int updateProjectNodeFinishTime(@Param("nodeBaseId") long nodeBaseId, @Param("finishTime") String finishTime, @Param("updater") Long updater, @Param("company") Long company);
 
-    ProjectNodeBase getParentProjectNodeBase(@Param("nodeId") long nodeId, @Param("level") int level, @Param("company") String company);
+    ProjectNodeBase getParentProjectNodeBase(@Param("nodeId") long nodeId, @Param("level") int level, @Param("company") Long company);
 
     ProjectNodeBase getDisciplineNode(@Param("projectName") String projectName, @Param("phaseName") String phaseName, @Param("disciplineName") String disciplineName);
 
diff --git a/pbs/src/main/java/com/sdm/pbs/model/bo/TaskRunsRsp.java b/pbs/src/main/java/com/sdm/pbs/model/bo/TaskRunsRsp.java
index ee123afb..e1178e9f 100644
--- a/pbs/src/main/java/com/sdm/pbs/model/bo/TaskRunsRsp.java
+++ b/pbs/src/main/java/com/sdm/pbs/model/bo/TaskRunsRsp.java
@@ -30,7 +30,7 @@ public class TaskRunsRsp {
         private String templateName;
         private long resultTaskId;
         private int isBase;
-        private String updater;
+        private Long updater;
         private String flowTemplateName;
         private String createTime;
 
diff --git a/pbs/src/main/java/com/sdm/pbs/service/impl/PbsServiceImpl.java b/pbs/src/main/java/com/sdm/pbs/service/impl/PbsServiceImpl.java
index 17eb5a97..e239ebdc 100644
--- a/pbs/src/main/java/com/sdm/pbs/service/impl/PbsServiceImpl.java
+++ b/pbs/src/main/java/com/sdm/pbs/service/impl/PbsServiceImpl.java
@@ -57,7 +57,7 @@ public class PbsServiceImpl implements PbsService {
 
     @Override
     public SdmResponse getRunVersion(GetRunVersionReq req) {
-        PbsRun pbsRun = pbsMapper.getPbsRunById(req.getRunId(), ThreadLocalContext.getCompany());
+        PbsRun pbsRun = pbsMapper.getPbsRunById(req.getRunId(), ThreadLocalContext.getTenantId());
         if (org.springframework.util.ObjectUtils.isEmpty(pbsRun)) {
             return SdmResponse.failed("该任务不存在");
         }
@@ -91,7 +91,7 @@ public class PbsServiceImpl implements PbsService {
     }
 
     public RunVersionInfo getRunVersionParent(long parentId, RunVersionInfo runVersionInfo) {
-        PbsRun runBean = pbsMapper.getPbsRunById(parentId, ThreadLocalContext.getCompany());
+        PbsRun runBean = pbsMapper.getPbsRunById(parentId, ThreadLocalContext.getTenantId());
         RunVersionInfo parentVersionInfo = getRunVersion(runBean);
         List<RunVersionInfo> runVersionInfos = new ArrayList<>();
         runVersionInfos.add(runVersionInfo);
@@ -154,7 +154,7 @@ public class PbsServiceImpl implements PbsService {
         if (!StringUtils.isEmpty(type)) {
             types = Arrays.asList(type.split(","));
         }
-        String company = ThreadLocalContext.getCompany();
+        Long company = ThreadLocalContext.getTenantId();
         int total = pbsMapper.getPbsTaskCount(req.getTaskName(), types, statuses, req.getJobNumber(), req.getTaskId(),
                 req.getProjectName(), req.getPhaseName(), req.getDisciplineName(), req.getRunName(), company);
         List<PbsTaskInfo> taskInfos = pbsMapper.getPbsTaskList(req.getTaskName(),
@@ -179,7 +179,7 @@ public class PbsServiceImpl implements PbsService {
             types = Arrays.asList(type.split(","));
         }
         List<Map> taskCount = pbsMapper.getPbsTaskCountByProject(req.getTaskName(), types, statuses, req.getJobNumber(), req.getTaskId(),
-                req.getProjectName(), req.getPhaseName(), req.getDisciplineName(), req.getRunName(), ThreadLocalContext.getCompany());
+                req.getProjectName(), req.getPhaseName(), req.getDisciplineName(), req.getRunName(), ThreadLocalContext.getTenantId());
         return SdmResponse.success(taskCount);
     }
 
@@ -191,7 +191,7 @@ public class PbsServiceImpl implements PbsService {
             pbsMapper.updateRunStatus(req.getRunId(), 1, startNode.getCreator());
             pbsMapper.updateFlowNodeStatus(startNode.getId(), 3, startNode.getCreator());
             startNode.setStatus(3);
-            SimulationFlowThread thread = new SimulationFlowThread(startNode, Tools.getRootPath(rootPath, ThreadLocalContext.getCompany()));
+            SimulationFlowThread thread = new SimulationFlowThread(startNode, Tools.getRootPath(rootPath, String.valueOf(ThreadLocalContext.getTenantId())));
             SdmThreadService.builder().execute(thread);
         } else {
             if (CollectionUtils.isEmpty(req.getFlowNodeNames())) {
@@ -199,7 +199,7 @@ public class PbsServiceImpl implements PbsService {
             }
             List<PbsFlowNode> nodes = pbsMapper.getFlowNodeByNames(req.getRunId(), req.getFlowNodeNames());
             for (PbsFlowNode pbsFlowNode : nodes) {
-                ExecuteFLowNodeThread thread = new ExecuteFLowNodeThread(pbsFlowNode, Tools.getRootPath(rootPath, ThreadLocalContext.getCompany()));
+                ExecuteFLowNodeThread thread = new ExecuteFLowNodeThread(pbsFlowNode, Tools.getRootPath(rootPath, String.valueOf(ThreadLocalContext.getTenantId())));
                 SdmThreadService.builder().execute(thread);
             }
         }
@@ -218,8 +218,8 @@ public class PbsServiceImpl implements PbsService {
                 PbsFlowNodeRelate relate = new PbsFlowNodeRelate();
                 relate.setParentNodeId(parentNodeId);
                 relate.setNodeId(flowNode.getId());
-                relate.setCompany(ThreadLocalContext.getCompany());
-                relate.setCreator(ThreadLocalContext.getJobNumber());
+                relate.setCompany(String.valueOf(ThreadLocalContext.getTenantId()));
+                relate.setCreator(ThreadLocalContext.getUserId());
                 relates.add(relate);
             }
             if (!CollectionUtils.isEmpty(flowNodeInfo.getChildren())) {
@@ -233,9 +233,9 @@ public class PbsServiceImpl implements PbsService {
 
     @Override
     public SdmResponse cancelJob(String jobId) {
-        String jobNumber = ThreadLocalContext.getJobNumber();
+        Long jobNumber = ThreadLocalContext.getUserId();
         // 初始化上下文
-        ApiClient apiClient = initApiClient(jobNumber);
+        ApiClient apiClient = initApiClient(String.valueOf(jobNumber));
         JobsApi jobsApi = new JobsApi();
         jobsApi.setApiClient(apiClient);
         try {
@@ -263,7 +263,7 @@ public class PbsServiceImpl implements PbsService {
         pbsTask.setQueueName(jsonObject.getString("queue"));
         pbsTask.setType(jsonObject.getString("appCode"));
         pbsTask.setStatus("PREP");
-        pbsTask.setCreator(jobNumber);
+        pbsTask.setCreator(Long.valueOf(jobNumber));
         pbsTask.setCompany(req.getCompany());
         // 初始化上下文
         ApiClient apiClient = initApiClient(jobNumber);
@@ -628,7 +628,7 @@ public class PbsServiceImpl implements PbsService {
 
     @Override
     public SdmResponse stopFlow(long runId) {
-        PbsRun run = pbsMapper.getPbsRunById(runId, ThreadLocalContext.getCompany());
+        PbsRun run = pbsMapper.getPbsRunById(runId, ThreadLocalContext.getTenantId());
         if (run.getStatus() != 1) {
             return SdmResponse.failed("该算例没有正在执行");
         }
@@ -642,7 +642,7 @@ public class PbsServiceImpl implements PbsService {
                 if (!(childNodes.size() == 1 && childNodes.get(0).getType() == 1)) {
                     allEndParent = false;
                     for (PbsFlowNode child : childNodes) {
-                        pbsMapper.updateFlowNodeStatus(child.getId(), 2, ThreadLocalContext.getJobNumber());
+                        pbsMapper.updateFlowNodeStatus(child.getId(), 2, ThreadLocalContext.getUserId());
                     }
                 }
             }
@@ -683,11 +683,11 @@ public class PbsServiceImpl implements PbsService {
             }
             if (parentFinished) {
                 // 执行子节点
-                ExecuteFLowNodeThread thread = new ExecuteFLowNodeThread(flowNode, Tools.getRootPath(rootPath, ThreadLocalContext.getCompany()));
+                ExecuteFLowNodeThread thread = new ExecuteFLowNodeThread(flowNode, Tools.getRootPath(rootPath, String.valueOf(ThreadLocalContext.getTenantId())));
                 SdmThreadService.builder().execute(thread);
             } else {
                 if (failed) {
-                    pbsMapper.updateFlowNodeStatus(flowNode.getId(), 5, ThreadLocalContext.getJobNumber());
+                    pbsMapper.updateFlowNodeStatus(flowNode.getId(), 5, ThreadLocalContext.getUserId());
                     // 遍历更新子节点
                     reverseDetermineFloeNode(flowNode.getId());
                 }
@@ -698,8 +698,8 @@ public class PbsServiceImpl implements PbsService {
 
     @Override
     public SdmResponse getTaskRuns(GetTaskRunsReq req) {
-        String jobNumber = ThreadLocalContext.getJobNumber();
-        String company = ThreadLocalContext.getCompany();
+        Long jobNumber = ThreadLocalContext.getUserId();
+        Long company = ThreadLocalContext.getTenantId();
         ProjectNodeBase disciplineNode = projectMapper.getDisciplineNode(req.getProjectName(), req.getPhaseName(), req.getDiscipline());
         List<ProjectNodeBase> nodeBeans = projectMapper.getNodeBaseChildren(disciplineNode.getId(), disciplineNode.getLevel(), company);
         String runFilter = req.getRunFilter();
@@ -721,7 +721,7 @@ public class PbsServiceImpl implements PbsService {
         return SdmResponse.success(infos);
     }
 
-    private JSONObject getChildNode(List<ProjectNodeBase> parentNodes, String taskFilter, String jobNumber, String runFilter, boolean parentFilter) {
+    private JSONObject getChildNode(List<ProjectNodeBase> parentNodes, String taskFilter, Long jobNumber, String runFilter, boolean parentFilter) {
         JSONObject result = new JSONObject();
         List<TaskRunsRsp.RspInfo> nodeInfos = new ArrayList<>();
         boolean finalFilter = true;
@@ -755,9 +755,9 @@ public class PbsServiceImpl implements PbsService {
         return result;
     }
 
-    private List<TaskRunsRsp.RspInfo> getNodeChildInfo(ProjectNodeBase node, String jobNumber, String taskFilter, String runFilter, boolean parentFilter) {
+    private List<TaskRunsRsp.RspInfo> getNodeChildInfo(ProjectNodeBase node, Long jobNumber, String taskFilter, String runFilter, boolean parentFilter) {
         List<TaskRunsRsp.RspInfo> children = new ArrayList<>();
-        String company = ThreadLocalContext.getCompany();
+        Long company = ThreadLocalContext.getTenantId();
         // 查询任务
         List<TaskBase> taskBases = projectMapper.getTaskByNodeId(node.getId(), company, null);
         List<TaskBase> userTaskBeans = null;
diff --git a/performance/src/main/java/com/sdm/performance/dao/PerformanceMapper.java b/performance/src/main/java/com/sdm/performance/dao/PerformanceMapper.java
index d40418eb..e0120d42 100644
--- a/performance/src/main/java/com/sdm/performance/dao/PerformanceMapper.java
+++ b/performance/src/main/java/com/sdm/performance/dao/PerformanceMapper.java
@@ -11,19 +11,19 @@ import java.util.List;
 @Mapper
 public interface PerformanceMapper {
 
-    int addPerformanceBaseBatch(@Param("bases") List<PerformanceBase> bases, @Param("company")  String company);
+    int addPerformanceBaseBatch(@Param("bases") List<PerformanceBase> bases, @Param("company")  Long company);
 
-    int addTaskPerformanceRelateBatch(@Param("relates") List<TaskPerformanceRelate> relates, @Param("company")  String company);
+    int addTaskPerformanceRelateBatch(@Param("relates") List<TaskPerformanceRelate> relates, @Param("company")  Long company);
 
-    int addPerformanceExpandBatch(@Param("expands") List<PerformanceExpand> expands, @Param("company")  String company);
+    int addPerformanceExpandBatch(@Param("expands") List<PerformanceExpand> expands, @Param("company")  Long company);
 
-    int updatePerformanceBase(@Param("base") PerformanceBase base, @Param("updater") String updater, @Param("company") String company);
+    int updatePerformanceBase(@Param("base") PerformanceBase base, @Param("updater") Long updater, @Param("company") Long company);
 
-    int updatePerformanceExpand(@Param("expand") PerformanceExpand expand, @Param("updater") String updater, @Param("company") String company);
+    int updatePerformanceExpand(@Param("expand") PerformanceExpand expand, @Param("updater") Long updater, @Param("company") Long company);
 
-    int delPerformanceExpandBatch(@Param("expandIds") List<Long> expandIds, @Param("company") String company);
+    int delPerformanceExpandBatch(@Param("expandIds") List<Long> expandIds, @Param("company") Long company);
 
-    PerformanceBase getPerformanceBaseById(@Param("performanceId") long performanceId, @Param("company") String company);
+    PerformanceBase getPerformanceBaseById(@Param("performanceId") long performanceId, @Param("company") Long company);
 
-    int delPerformanceById(@Param("performanceId") long performanceId, @Param("company") String company);
+    int delPerformanceById(@Param("performanceId") long performanceId, @Param("company") Long company);
 }
diff --git a/performance/src/main/java/com/sdm/performance/service/impl/PerformanceServiceImpl.java b/performance/src/main/java/com/sdm/performance/service/impl/PerformanceServiceImpl.java
index efa47cdb..51770c10 100644
--- a/performance/src/main/java/com/sdm/performance/service/impl/PerformanceServiceImpl.java
+++ b/performance/src/main/java/com/sdm/performance/service/impl/PerformanceServiceImpl.java
@@ -25,7 +25,7 @@ public class PerformanceServiceImpl implements PerformanceService {
     @Transactional
     @Override
     public SdmResponse addPerformance(AddPerformanceReq req) {
-        String company = ThreadLocalContext.getCompany();
+        Long company = ThreadLocalContext.getTenantId();
         int result = performanceMapper.addPerformanceBaseBatch(req.getBases(), company);
         if (result <= 0) {
             return SdmResponse.failed("新增指标失败！");
@@ -51,8 +51,8 @@ public class PerformanceServiceImpl implements PerformanceService {
 
     @Override
     public SdmResponse updatePerformanceBatch(UpdatePerformanceBatchReq req) {
-        String company = ThreadLocalContext.getCompany();
-        String updater = ThreadLocalContext.getJobNumber();
+        Long company = ThreadLocalContext.getTenantId();
+        Long updater = ThreadLocalContext.getUserId();
         if (!CollectionUtils.isEmpty(req.getBases())) {
             req.getBases().parallelStream().forEach(performanceBase -> performanceMapper.updatePerformanceBase(performanceBase, updater, company));
         }
@@ -77,7 +77,7 @@ public class PerformanceServiceImpl implements PerformanceService {
     @Override
     public SdmResponse delPerformance(DelPerformanceReq req) {
         // todo 权限控制
-        String company = ThreadLocalContext.getCompany();
+        Long company = ThreadLocalContext.getTenantId();
         PerformanceBase performanceBase = performanceMapper.getPerformanceBaseById(req.getPerformanceId(), company);
         if (ObjectUtils.isEmpty(performanceBase)) {
             return SdmResponse.failed("指标不存在！");
diff --git a/project/src/main/java/com/sdm/project/dao/SimulationDemandMapper.java b/project/src/main/java/com/sdm/project/dao/SimulationDemandMapper.java
index 91e738b7..c1eefa04 100644
--- a/project/src/main/java/com/sdm/project/dao/SimulationDemandMapper.java
+++ b/project/src/main/java/com/sdm/project/dao/SimulationDemandMapper.java
@@ -10,13 +10,13 @@ import java.util.List;
 @Mapper
 public interface SimulationDemandMapper {
 
-    int addDemand(@Param("req") SpdmAddDemandReq req,@Param("tenantId") String tenantId,@Param("jobNumber") String jobNumber);
+    int addDemand(@Param("req") SpdmAddDemandReq req,@Param("tenantId") Long tenantId,@Param("jobNumber") Long jobNumber);
 
     int addDemandMember(@Param("memberList") List<SpdmDemandRelateMemberReq> memberList);
 
     int addDemandExtra(@Param("demandExtraList") List<SpdmDemandExtraReq> demandExtraList);
 
-    int editDemand(@Param("req") SpdmEditDemandReq req, @Param("jobNumber") String jobNumber);
+    int editDemand(@Param("req") SpdmEditDemandReq req, @Param("jobNumber") Long jobNumber);
 
     void deleteDemandMember(@Param("demandIdList") List<String> demandIdList);
 
@@ -24,13 +24,13 @@ public interface SimulationDemandMapper {
 
     void deleteDemand(@Param("deleteNodeIdList") List<String> deleteNodeIdList);
 
-    List<SpdmDemandVo> getDemandList(@Param("tenantId") String tenantId,@Param("req") SpdmDemandListReq req);
+    List<SpdmDemandVo> getDemandList(@Param("tenantId") Long tenantId,@Param("req") SpdmDemandListReq req);
 
     List<SpdmDemandMemberVo> getMemberList(@Param("demandIdList") List<String> demandIdList, @Param("memberType") Integer memberType);
 
 //    List<SpdmUserVo> getUserList(@Param("userIdList") List<Long> userIdList);
 
-    SpdmUserVo getUserByJobNumber(@Param("jobNumber") String jobNumber);
+    SpdmUserVo getUserByJobNumber(@Param("jobNumber") Long jobNumber);
 
-    SpdmDemandVo getDemandByName(@Param("tenantId") String tenantId,@Param("demandName") String demandName);
+    SpdmDemandVo getDemandByName(@Param("tenantId") Long tenantId,@Param("demandName") String demandName);
 }
diff --git a/project/src/main/java/com/sdm/project/dao/SimulationNodeMapper.java b/project/src/main/java/com/sdm/project/dao/SimulationNodeMapper.java
index 00d5eb62..0f3b2656 100644
--- a/project/src/main/java/com/sdm/project/dao/SimulationNodeMapper.java
+++ b/project/src/main/java/com/sdm/project/dao/SimulationNodeMapper.java
@@ -36,10 +36,10 @@ public interface SimulationNodeMapper extends BaseMapper<SimulationNode> {
 
 
     List<SpdmNodeVo> getNodeList(@Param("nodeType") String nodeType, @Param("nodeSubType") String nodeSubType, @Param("progressStatus") Integer progressStatus, @Param("nodeCode") String nodeCode,
-                                 @Param("manager") String manager, @Param("nodeName") String nodeName, @Param("tenantId") String tenantId, @Param("pos") int pos, @Param("limit") int limit);
+                                 @Param("manager") String manager, @Param("nodeName") String nodeName, @Param("tenantId") Long tenantId, @Param("pos") int pos, @Param("limit") int limit);
 
     int getNodeListCount(@Param("nodeType") String nodeType, @Param("nodeSubType") String nodeSubType, @Param("progressStatus") Integer progressStatus, @Param("nodeCode") String nodeCode,
-                                      @Param("manager") String manager, @Param("nodeName") String nodeName, @Param("tenantId") String tenantId);
+                                      @Param("manager") String manager, @Param("nodeName") String nodeName, @Param("tenantId") Long tenantId);
 
 
     List<SpdmNodeExtraVo> getNodeExtraListByNodeIdList(@Param("nodeIdList") List<String> nodeIdList);
diff --git a/project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java b/project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java
index d25ea6f9..a422b1af 100644
--- a/project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java
+++ b/project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java
@@ -17,7 +17,7 @@ public interface SimulationTaskMapper extends BaseMapper<SimulationTask> {
 
     SdmResponse list(SpdmTaskListReq req);
 
-    List<SpdmTaskVo> getTaskList(@Param("tenantId") String tenantId, @Param("req") SpdmTaskListReq req);
+    List<SpdmTaskVo> getTaskList(@Param("tenantId") Long tenantId, @Param("req") SpdmTaskListReq req);
 
     List<SpdmTaskMemberVo> getMemberList(@Param("taskIdList") List<String> taskIdList, @Param("memberType") Integer memberType);
 
@@ -27,7 +27,7 @@ public interface SimulationTaskMapper extends BaseMapper<SimulationTask> {
 
     SpdmTaskVo getTask(@Param("taskId") String taskId);
 
-    List<SpdmAnalysisTaskVo> taskList(@Param("req") SpdmAnalysisTaskListReq req, @Param("tenantId") String tenantId, @Param("allNodeIdList") List<String> allNodeIdList, @Param("pos") int pos, @Param("limit") int limit);
+    List<SpdmAnalysisTaskVo> taskList(@Param("req") SpdmAnalysisTaskListReq req, @Param("tenantId") Long tenantId, @Param("allNodeIdList") List<String> allNodeIdList, @Param("pos") int pos, @Param("limit") int limit);
 
     void deleteAttentionByUserIdList(@Param("taskId") String taskId,@Param("userIdList") List<Long> userIdList);
 
diff --git a/project/src/main/java/com/sdm/project/model/bo/ProjectNode.java b/project/src/main/java/com/sdm/project/model/bo/ProjectNode.java
index 212e194e..9ae4bffa 100644
--- a/project/src/main/java/com/sdm/project/model/bo/ProjectNode.java
+++ b/project/src/main/java/com/sdm/project/model/bo/ProjectNode.java
@@ -1,5 +1,6 @@
 package com.sdm.project.model.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sdm.common.entity.pojo.BaseEntity;
@@ -162,7 +163,7 @@ public class ProjectNode extends BaseEntity {
 
     private String nodeVersion;
 
-    private String tenantId;
+//    private String tenantId;
 
 
 
diff --git a/project/src/main/java/com/sdm/project/model/bo/TaskNode.java b/project/src/main/java/com/sdm/project/model/bo/TaskNode.java
index c04331ae..83be1bca 100644
--- a/project/src/main/java/com/sdm/project/model/bo/TaskNode.java
+++ b/project/src/main/java/com/sdm/project/model/bo/TaskNode.java
@@ -165,7 +165,7 @@ public class TaskNode extends BaseEntity {
 
     private String nodeVersion;
 
-    private String tenantId;
+    private Long tenantId;
 
     private List<TaskExtraNode> taskExtraNodeList;
 
diff --git a/project/src/main/java/com/sdm/project/model/po/NodeAllBase.java b/project/src/main/java/com/sdm/project/model/po/NodeAllBase.java
index efaefe89..590bebbe 100644
--- a/project/src/main/java/com/sdm/project/model/po/NodeAllBase.java
+++ b/project/src/main/java/com/sdm/project/model/po/NodeAllBase.java
@@ -185,7 +185,7 @@ public class NodeAllBase extends BaseEntity {
 
     public String nodeVersion;
 
-    public String tenantId;
+    public Long tenantId;
 
     public String members;
 
diff --git a/project/src/main/java/com/sdm/project/model/req/SpdmNodeDetailReq.java b/project/src/main/java/com/sdm/project/model/req/SpdmNodeDetailReq.java
index 6da19d0c..632826c6 100644
--- a/project/src/main/java/com/sdm/project/model/req/SpdmNodeDetailReq.java
+++ b/project/src/main/java/com/sdm/project/model/req/SpdmNodeDetailReq.java
@@ -91,7 +91,7 @@ public class SpdmNodeDetailReq extends BaseEntity {
      */
     private List<SpdmNodeExtraReq> extraList;
 
-    private String tenantId;
+    private Long tenantId;
 
     private String standard;
     private String analyseTarget;
diff --git a/project/src/main/java/com/sdm/project/model/req/TaskEditNodeReq.java b/project/src/main/java/com/sdm/project/model/req/TaskEditNodeReq.java
index 0021abc9..1a4c91c9 100644
--- a/project/src/main/java/com/sdm/project/model/req/TaskEditNodeReq.java
+++ b/project/src/main/java/com/sdm/project/model/req/TaskEditNodeReq.java
@@ -95,7 +95,7 @@ public class TaskEditNodeReq extends BaseEntity {
      */
     private List<SpdmNodeExtraReq> nodeExtraList;
 
-    private String tenantId;
+    private Long tenantId;
 
     private String nodeId;
 
diff --git a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java
index d17d72dc..e40c3197 100644
--- a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java
@@ -66,8 +66,8 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
     @Transactional
     @Override
     public SdmResponse addDemand(SpdmAddDemandReq req) {
-        String tenantId = ThreadLocalContext.getCompany();
-        String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
+        Long tenantId = ThreadLocalContext.getTenantId();
+        Long jobNumber = ThreadLocalContext.getUserId();
         log.info("新增需求时，当前租户id为：{}，工号为：{}", tenantId, jobNumber);
         // 获取仿真负责人
         String pMemberList = req.getPMemberList();
@@ -149,8 +149,8 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
     @Transactional
     @Override
     public SdmResponse editDemand(SpdmEditDemandReq req) {
-        String tenantId = ThreadLocalContext.getCompany();
-        String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
+        Long tenantId = ThreadLocalContext.getTenantId();
+        Long jobNumber = ThreadLocalContext.getUserId();
         log.info("修改需求时，当前租户id为：{}，工号为：{}", tenantId, jobNumber);
         // 获取仿真负责人
         String pMemberList = req.getPMemberList();
@@ -229,9 +229,9 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
 
     @Override
     public SdmResponse list(SpdmDemandListReq req) {
-        String tenantId = ThreadLocalContext.getCompany();
-        String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
-        if (StringUtils.isBlank(tenantId) || StringUtils.isBlank(jobNumber)) {
+        Long tenantId = ThreadLocalContext.getTenantId();
+        Long jobNumber = ThreadLocalContext.getUserId();
+        if (ObjectUtils.isEmpty(tenantId) || ObjectUtils.isEmpty(jobNumber)) {
             log.error("公司和工号都不能为空");
             return SdmResponse.failed("公司和工号都不能为空");
         }
@@ -442,7 +442,7 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
     @Override
     public SdmResponse issueTask(SpdmTaskIssue req) {
         log.info("issueTask参数为：{}", req);
-        String tenantId = ThreadLocalContext.getCompany();
+        Long tenantId = ThreadLocalContext.getTenantId();
         List<TaskNode> taskNodeList = req.getAddNodeList();
         if (CollectionUtils.isEmpty(taskNodeList)) {
             return SdmResponse.success(new ArrayList<>());
@@ -516,7 +516,7 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
             }
 
         }
-        String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
+        Long jobNumber = ThreadLocalContext.getUserId();
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String createTime = format.format(new Date());
         SdmResponse response = SdmResponse.success();
diff --git a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
index b46b2e55..2748db47 100644
--- a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
@@ -84,8 +84,8 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
     @Transactional
     @Override
     public SdmResponse add(SpdmAddNodeReq req) {
-        String tenantId = ThreadLocalContext.getCompany();
-        String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
+        Long tenantId = ThreadLocalContext.getTenantId();
+        Long jobNumber = ThreadLocalContext.getUserId();
         log.info("当前租户id为：{}，工号为：{}", tenantId, jobNumber);
         // 增
         List<SpdmProjectNodeEditReq> addNodeList = req.getAddNodeList();
@@ -105,8 +105,8 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
     @Transactional
     @Override
     public SdmResponse edit(SpdmEditNodeReq req) {
-        String tenantId = ThreadLocalContext.getCompany();
-        String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
+        Long tenantId = ThreadLocalContext.getTenantId();
+        Long jobNumber = ThreadLocalContext.getUserId();
         log.info("当前租户id为：{},jobNumber：{}", tenantId, jobNumber);
         // 改
         List<SpdmNodeDetailReq> editNodeList = req.getEditNodeList();
@@ -124,7 +124,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
     @Override
     public SdmResponse delete(SpdmDeleteNodeReq req) {
         log.info("node delete参数：{}", req);
-        String tenantId = ThreadLocalContext.getCompany();
+        Long tenantId = ThreadLocalContext.getTenantId();
         log.info("当前租户id为：{}", tenantId);
         // 删
         List<String> deleteNodeIdList = req.getDeleteNodeIdList();
@@ -178,14 +178,14 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
         int pos = (req.getCurrent() - 1) * req.getSize();
         int limit = req.getSize();
         List<SpdmNodeVo> nodeList = nodeMapper.getNodeList(req.getNodeType(), req.getNodeSubType(), req.getProgressStatus(), req.getNodeCode(), req.getManager(), req.getNodeName(),
-                ThreadLocalContext.getCompany(), pos, limit);
+                ThreadLocalContext.getTenantId(), pos, limit);
         if (CollectionUtils.isEmpty(nodeList)) {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("data", nodeList);
             jsonObject.put("total", 0);
             return SdmResponse.success(jsonObject);
         }
-        int total = nodeMapper.getNodeListCount(req.getNodeType(), req.getNodeSubType(), req.getProgressStatus(), req.getNodeCode(), req.getManager(), req.getNodeName(), ThreadLocalContext.getCompany());
+        int total = nodeMapper.getNodeListCount(req.getNodeType(), req.getNodeSubType(), req.getProgressStatus(), req.getNodeCode(), req.getManager(), req.getNodeName(), ThreadLocalContext.getTenantId());
         log.info("总数为：{}", total);
         Integer progressStatus;
         Integer achieveStatus;
@@ -283,7 +283,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
     }
 
 
-    private List<SpdmProjectNodeEditReq> addNode(List<SpdmProjectNodeEditReq> addNodeList, List<TaskNodeTag> tagMap, String tenantId, String jobNumber) {
+    private List<SpdmProjectNodeEditReq> addNode(List<SpdmProjectNodeEditReq> addNodeList, List<TaskNodeTag> tagMap, Long tenantId, Long jobNumber) {
         log.info("addNode参数为：{}", addNodeList);
         String curDateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String nodeManagerList;
@@ -380,7 +380,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
         return addNodeList;
     }
 
-    private boolean editNode(List<SpdmNodeDetailReq> editNodeList, String tenantId, String jobNumber) {
+    private boolean editNode(List<SpdmNodeDetailReq> editNodeList, Long tenantId, Long jobNumber) {
         log.info("editNode参数为：{}", editNodeList);
         String curDateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String nodeManagerList;
@@ -515,9 +515,9 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
             }
         }
         // 创建人要返回对象
-        String creator = projectNode.getCreator();
-        if (StringUtils.isNotBlank(creator)) {
-            SdmResponse<CIDUserResp> cidUserRespSdmResponse = sysUserFeignClient.queryUserDetail(UserQueryReq.builder().userId(Long.valueOf(creator)).build());
+        Long creator = projectNode.getCreator();
+        if (ObjectUtils.isNotEmpty(creator)) {
+            SdmResponse<CIDUserResp> cidUserRespSdmResponse = sysUserFeignClient.queryUserDetail(UserQueryReq.builder().userId(creator).build());
             if (cidUserRespSdmResponse.isSuccess()) {
                 projectNode.setCreatorObj(cidUserRespSdmResponse.getData());
             }
diff --git a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java
index 321fe6c2..af892e44 100644
--- a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java
@@ -79,7 +79,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
     @Override
     @Transactional
     public SdmResponse add(JSONObject jsonObject) {
-        String tenantId = ThreadLocalContext.getCompany();
+        Long tenantId = ThreadLocalContext.getTenantId();
         TaskNodeTree taskNodeTree = parseTaskTree(jsonObject);
         HashMap<String, List<String>> idMap = new HashMap<>();
         HashMap<String, List<String>> taskIdMap = new HashMap<>();
@@ -94,8 +94,8 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
 
     @Override
     public SdmResponse edit(List<TaskEditNodeReq> taskEditNodeReqList) {
-        String tenantId = ThreadLocalContext.getCompany();
-        String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
+        Long tenantId = ThreadLocalContext.getTenantId();
+        Long jobNumber = ThreadLocalContext.getUserId();
         String nodeType;
         Map<String, List<TaskEditNodeReq>> editNodeListMap = taskEditNodeReqList.stream().collect(Collectors.groupingBy(TaskEditNodeReq::getNodeType));
         String updateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
@@ -128,7 +128,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
         return SdmResponse.success();
     }
 
-    private boolean editNode(List<SpdmNodeDetailReq> editNodeList, String tenantId, String jobNumber) {
+    private boolean editNode(List<SpdmNodeDetailReq> editNodeList, Long tenantId, Long jobNumber) {
         log.info("editNode参数为：{}", editNodeList);
         String curDateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         List<SpdmNodeExtraReq> extraList;
@@ -612,7 +612,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
         List<TaskEditNodeReq> editNodeList = req.getEditNodeList();
         List<SpdmDeleteProjectDetailReq> deleteNodeList = req.getDeleteNodeList();
         if (CollectionUtils.isNotEmpty(addNodeList)) {
-            String tenantId = ThreadLocalContext.getCompany();
+            Long tenantId = ThreadLocalContext.getTenantId();
             TaskNodeTree taskNodeTree = newParseTaskTree(JSONArray.parseArray(JSONArray.toJSONString(addNodeList)));
             HashMap<String, List<String>> idMap = new HashMap<>();
             HashMap<String, List<String>> taskIdMap = new HashMap<>();
@@ -1272,8 +1272,8 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
         }
     }
 
-    private SdmResponse newRealAddSimulationTaskItems(TaskNodeTree taskNodeTree, String tenantId, List<TaskNodeTag> tagList) {
-        String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
+    private SdmResponse newRealAddSimulationTaskItems(TaskNodeTree taskNodeTree, Long tenantId, List<TaskNodeTag> tagList) {
+        Long jobNumber = ThreadLocalContext.getUserId();
         SdmResponse response = SdmResponse.success();
         if (CollectionUtils.isEmpty(taskNodeTree.getNodeList())) {
             response = SdmResponse.failed("节点不能为空");
@@ -1466,8 +1466,8 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
         return response;
     }
 
-    private SdmResponse realAddSimulationTaskItems(TaskNodeTree taskNodeTree, String parentId, String tenantId,HashMap<String, List<String>> idMap,HashMap<String, List<String>> taskIdMap) {
-        String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
+    private SdmResponse realAddSimulationTaskItems(TaskNodeTree taskNodeTree, String parentId, Long tenantId,HashMap<String, List<String>> idMap,HashMap<String, List<String>> taskIdMap) {
+        Long jobNumber = ThreadLocalContext.getUserId();
         SdmResponse response = SdmResponse.success();
         if (CollectionUtils.isEmpty(taskNodeTree.getNodeList())) {
             response = SdmResponse.failed("节点不能为空");
@@ -1664,7 +1664,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
 //        log.info("调用创建文件夹的返回值为：{}", response);
     }
 
-    private void traverseTaskNode(String parentId, String tenantId, String nodeVersion, TaskNode eachProjectNode, List<TaskNode> projectNodeList, List<TaskMemberNode> projectNodeMemberList, List<TaskExtraNode> projectNodeExtraList, List<TaskNode> taskNodeList, List<TaskMemberNode> taskNodeMemberList, List<TaskExtraNode> taskNodeExtraList, List<TaskNode> taskPerformanceList, List<TaskExtraNode> performanceExtraList, List<TaskNodeTag> tagList,HashMap<String, List<String>> idMap,HashMap<String, List<String>> taskIdMap) {
+    private void traverseTaskNode(String parentId, Long tenantId, String nodeVersion, TaskNode eachProjectNode, List<TaskNode> projectNodeList, List<TaskMemberNode> projectNodeMemberList, List<TaskExtraNode> projectNodeExtraList, List<TaskNode> taskNodeList, List<TaskMemberNode> taskNodeMemberList, List<TaskExtraNode> taskNodeExtraList, List<TaskNode> taskPerformanceList, List<TaskExtraNode> performanceExtraList, List<TaskNodeTag> tagList,HashMap<String, List<String>> idMap,HashMap<String, List<String>> taskIdMap) {
 //        if (!bStringNotBlank(projectNode.getUuid())) {//兼容在已有节点下添加分析项情况
 //            projectNode.setUuid(generateUuid());
 //        }
@@ -2027,7 +2027,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
 
     @Override
     public SdmResponse taskHandle(String taskId, Integer handleType) {
-        String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
+        Long jobNumber = ThreadLocalContext.getUserId();
         List<TaskNodePo> taskNodePoList = mapper.getTaskListByNodeIdList(Collections.singletonList(taskId));
         if (CollectionUtils.isEmpty(taskNodePoList)) {
             log.error("根据taskId：{}，未查询到任务", taskId);
@@ -2053,7 +2053,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
         List<TaskEditNodeReq> editNodeList = req.getEditNodeList();
         List<SpdmDeleteProjectDetailReq> deleteNodeList = req.getDeleteNodeList();
         if (CollectionUtils.isNotEmpty(addNodeList)) {
-            String tenantId = ThreadLocalContext.getCompany();
+            Long tenantId = ThreadLocalContext.getTenantId();
             TaskNodeTree taskNodeTree = newParseTaskTree(JSONArray.parseArray(JSONArray.toJSONString(addNodeList)));
             tagMap = req.getTagMap();
             SdmResponse response = newRealAddSimulationTaskItems(taskNodeTree, tenantId, req.getTagMap());
diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
index be634b75..489160dd 100644
--- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
@@ -85,10 +85,9 @@ public class TaskServiceImpl implements ITaskService {
 
     @Override
     public SdmResponse list(SpdmTaskListReq req) {
-        String tenantId = ThreadLocalContext.getCompany();
-//        String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
+        Long tenantId = ThreadLocalContext.getTenantId();
         Long userId = ThreadLocalContext.getUserId();
-        if (StringUtils.isBlank(tenantId) || Objects.isNull(userId)) {
+        if (Objects.isNull(tenantId) || Objects.isNull(userId)) {
             log.error("公司和工号都不能为空");
             return SdmResponse.failed("公司和工号都不能为空");
         }
@@ -482,10 +481,10 @@ public class TaskServiceImpl implements ITaskService {
 
     @Override
     public SdmResponse countByStatus(SpdmTaskCountReq req) {
-        String tenantId = ThreadLocalContext.getCompany();
+        Long tenantId = ThreadLocalContext.getTenantId();
 //        String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
         Long userId = ThreadLocalContext.getUserId();
-        if (StringUtils.isBlank(tenantId) || Objects.isNull(userId)) {
+        if (Objects.isNull(tenantId) || Objects.isNull(userId)) {
             log.error("公司和工号都不能为空");
             return SdmResponse.failed("公司和工号都不能为空");
         }
@@ -709,7 +708,7 @@ public class TaskServiceImpl implements ITaskService {
     public SdmResponse analysisTaskList(SpdmAnalysisTaskListReq req) {
         int pos = (req.getCurrent() - 1) * req.getSize();
         int limit = req.getSize();
-        String tenantId = ThreadLocalContext.getCompany();
+        Long tenantId = ThreadLocalContext.getTenantId();
         String projectNodeId = req.getProjectNodeId();
         String phaseNodeId = req.getPhaseNodeId();
         String disciplineNodeId = req.getDisciplineNodeId();
@@ -844,7 +843,7 @@ public class TaskServiceImpl implements ITaskService {
         if (CollectionUtils.isNotEmpty(addUserIdList)) {
             List<SpdmTaskAttentionReq> attentionList = new ArrayList<>();
             String curDateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
-            String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
+            Long jobNumber = ThreadLocalContext.getUserId();
             // 关注
             for (Long userId : addUserIdList) {
                 SpdmTaskAttentionReq spdmTaskAttentionReq = new SpdmTaskAttentionReq();
@@ -864,11 +863,8 @@ public class TaskServiceImpl implements ITaskService {
     @Override
     public SdmResponse edit(ModifyTaskNode req) {
         List<TaskEditNodeReq> taskEditNodeReqList = req.getEditNodeList();
-        String tenantId = ThreadLocalContext.getCompany();
-        String jobNumber = ThreadLocalContext.getCommonHeader().getJobNumber();
         String nodeType;
         Map<String, List<TaskEditNodeReq>> editNodeListMap = taskEditNodeReqList.stream().collect(Collectors.groupingBy(TaskEditNodeReq::getNodeType));
-        String updateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         for (Map.Entry<String, List<TaskEditNodeReq>> taskEntry : editNodeListMap.entrySet()) {
             nodeType = taskEntry.getKey();
             log.info("nodeType为：{}", nodeType);
diff --git a/system/src/main/java/com/sdm/system/dao/SystemMapper.java b/system/src/main/java/com/sdm/system/dao/SystemMapper.java
index 515f4509..767db406 100644
--- a/system/src/main/java/com/sdm/system/dao/SystemMapper.java
+++ b/system/src/main/java/com/sdm/system/dao/SystemMapper.java
@@ -11,30 +11,30 @@ import java.util.List;
 @Mapper
 public interface SystemMapper {
 
-    SysCompany getCompanyByName(@Param("company") String company);
+    SysCompany getCompanyByName(@Param("company") Long company);
 
     int addCompany(@Param("sysCompany") SysCompany sysCompany);
 
-    int updateCompanyStatus(@Param("company") String company, @Param("status") Integer status, @Param("updater") String updater);
+    int updateCompanyStatus(@Param("company") Long company, @Param("status") Integer status, @Param("updater") String updater);
 
-    List<SysCompany> getCompanyList(@Param("company") String company, @Param("status") Integer status, @Param("initDir") Integer initDir, @Param("pos") int pos, @Param("limit") int limit);
+    List<SysCompany> getCompanyList(@Param("company") Long company, @Param("status") Integer status, @Param("initDir") Integer initDir, @Param("pos") int pos, @Param("limit") int limit);
 
-    int getCompanyCount(@Param("company") String company, @Param("status") Integer status, @Param("initDir") Integer initDir);
+    int getCompanyCount(@Param("company") Long company, @Param("status") Integer status, @Param("initDir") Integer initDir);
 
     int addSysConfigBatch(@Param("configs") List<SysConfig> configs);
 
-    List<SysConfig> getSysConfig(@Param("configName") String configName, @Param("company") String company);
+    List<SysConfig> getSysConfig(@Param("configName") String configName, @Param("company") Long company);
 
-    int delSysConfigByName(@Param("configName") String configName, @Param("company") String company);
+    int delSysConfigByName(@Param("configName") String configName, @Param("company") Long company);
 
-    List<String> queryGroupMemberByGroupName(@Param("groupName") String groupName, @Param("company") String company);
+    List<String> queryGroupMemberByGroupName(@Param("groupName") String groupName, @Param("company") Long company);
 
-    List<SysWhiteList> getSysWhiteList(@Param("status") Integer status, @Param("company") String company, @Param("pos") int pos, @Param("limit") int limit);
-    int getSysWhiteListCount(@Param("status") Integer status, @Param("company") String company);
+    List<SysWhiteList> getSysWhiteList(@Param("status") Integer status, @Param("company") Long company, @Param("pos") int pos, @Param("limit") int limit);
+    int getSysWhiteListCount(@Param("status") Integer status, @Param("company") Long company);
 
     int addSysWhiteList(@Param("whiteLists") List<SysWhiteList> whiteLists);
 
-    int updateSysWhiteList(@Param("whiteList") SysWhiteList whiteList, @Param("updater") String updater);
+    int updateSysWhiteList(@Param("whiteList") SysWhiteList whiteList, @Param("updater") Long updater);
 
     SysWhiteList getSysWhiteListById(@Param("id") Integer id);
 
diff --git a/system/src/main/java/com/sdm/system/service/impl/SystemServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/SystemServiceImpl.java
index 1e710120..33fc5078 100644
--- a/system/src/main/java/com/sdm/system/service/impl/SystemServiceImpl.java
+++ b/system/src/main/java/com/sdm/system/service/impl/SystemServiceImpl.java
@@ -32,7 +32,7 @@ public class SystemServiceImpl implements SystemService {
 
     @Override
     public SdmResponse addCompany(SysCompany company) {
-        SysCompany sysCompany = systemMapper.getCompanyByName(company.getCompany());
+        SysCompany sysCompany = systemMapper.getCompanyByName(company.getTenantId());
         if (ObjectUtils.isNotEmpty(sysCompany)) {
             return SdmResponse.failed("公司已存在");
         }
@@ -45,14 +45,14 @@ public class SystemServiceImpl implements SystemService {
 
     @Override
     public SdmResponse updateCompanyStatus(String company, int status) {
-        SysCompany sysCompany = systemMapper.getCompanyByName(company);
+        SysCompany sysCompany = systemMapper.getCompanyByName(Long.valueOf(company));
         if (ObjectUtils.isNotEmpty(sysCompany)) {
             return SdmResponse.failed("公司已存在");
         }
         if (sysCompany.getStatus() == status) {
             return SdmResponse.failed("公司状态无需变更");
         }
-        int result = systemMapper.updateCompanyStatus(company, status, ThreadLocalContext.getJobNumber());
+        int result = systemMapper.updateCompanyStatus(Long.valueOf(company), status, ThreadLocalContext.getJobNumber());
         if (result <= 0) {
             return SdmResponse.failed("更新公司状态失败");
         }
@@ -63,8 +63,8 @@ public class SystemServiceImpl implements SystemService {
     public SdmResponse getCompanyList(GetCompanyListReq req) {
         int pos = (req.getPageNum() - 1) * req.getPageSize();
         int limit = req.getPageSize();
-        List<SysCompany> companyList = systemMapper.getCompanyList(req.getCompany(), req.getStatus(), null, pos, limit);
-        int total = systemMapper.getCompanyCount(req.getCompany(), req.getStatus(), null);
+        List<SysCompany> companyList = systemMapper.getCompanyList(Long.valueOf(req.getCompany()), req.getStatus(), null, pos, limit);
+        int total = systemMapper.getCompanyCount(Long.valueOf(req.getCompany()), req.getStatus(), null);
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("total", total);
         jsonObject.put("list", companyList);
@@ -82,11 +82,11 @@ public class SystemServiceImpl implements SystemService {
 
     @Override
     public SdmResponse delSysConfig(String configName) {
-        List<SysConfig> configs = systemMapper.getSysConfig(configName, ThreadLocalContext.getCompany());
+        List<SysConfig> configs = systemMapper.getSysConfig(configName, ThreadLocalContext.getTenantId());
         if (CollectionUtils.isEmpty(configs)) {
             return SdmResponse.failed("系统配置不存在");
         }
-        int result = systemMapper.delSysConfigByName(configName, ThreadLocalContext.getCompany());
+        int result = systemMapper.delSysConfigByName(configName, ThreadLocalContext.getTenantId());
         if (result <= 0) {
             return SdmResponse.failed("删除系统配置失败");
         }
@@ -95,8 +95,8 @@ public class SystemServiceImpl implements SystemService {
 
     @Override
     public SdmResponse querySysConfig(QuerySysConfigReq req) {
-        String loginJobNumber = ThreadLocalContext.getJobNumber();
-        String company = ThreadLocalContext.getCompany();
+        Long loginJobNumber = ThreadLocalContext.getUserId();
+        Long company = ThreadLocalContext.getTenantId();
         String configName = req.getConfigName();
         List<SysConfig> results = new ArrayList<>();
         // 不是root用户或admin，要筛选用户所在学科
@@ -129,8 +129,8 @@ public class SystemServiceImpl implements SystemService {
     @Override
     public SdmResponse getSysWhiteList(GetSysWhiteListReq req) {
         int pos = (req.getPageNum() - 1) * req.getPageSize();
-        List<SysWhiteList> list = systemMapper.getSysWhiteList(req.getStatus(), ThreadLocalContext.getCompany(), pos, req.getPageSize());
-        int total = systemMapper.getSysWhiteListCount(req.getStatus(), ThreadLocalContext.getCompany());
+        List<SysWhiteList> list = systemMapper.getSysWhiteList(req.getStatus(), ThreadLocalContext.getTenantId(), pos, req.getPageSize());
+        int total = systemMapper.getSysWhiteListCount(req.getStatus(), ThreadLocalContext.getTenantId());
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("total", total);
         jsonObject.put("list", list);
@@ -154,7 +154,7 @@ public class SystemServiceImpl implements SystemService {
     }
 
     private void updateSysWhiteList(SysWhiteList whiteList) {
-        systemMapper.updateSysWhiteList(whiteList, ThreadLocalContext.getCompany());
+        systemMapper.updateSysWhiteList(whiteList, ThreadLocalContext.getTenantId());
         redisUtil.set(RedisConstant.WHITE_LIST + whiteList.getUrl(), whiteList.getRole());
     }
 
diff --git a/task/src/main/java/com/sdm/task/dao/PbsMapper.java b/task/src/main/java/com/sdm/task/dao/PbsMapper.java
index 8d81b89e..3a7c350a 100644
--- a/task/src/main/java/com/sdm/task/dao/PbsMapper.java
+++ b/task/src/main/java/com/sdm/task/dao/PbsMapper.java
@@ -10,9 +10,9 @@ import java.util.List;
 @Mapper
 public interface PbsMapper {
 
-    PbsRun getPbsRunById(@Param("runId") long runId, @Param("company") String company);
+    PbsRun getPbsRunById(@Param("runId") long runId, @Param("company") Long company);
 
-    int getBaseRunCount(@Param("taskId") long taskId, @Param("company") String company);
+    int getBaseRunCount(@Param("taskId") long taskId, @Param("company") Long company);
 
     int updateTaskAndRunRelate(@Param("runId") long runId, @Param("taskId") long taskId);
 
diff --git a/task/src/main/java/com/sdm/task/dao/ProjectMapper.java b/task/src/main/java/com/sdm/task/dao/ProjectMapper.java
index 9c6ec5b2..16a3b32e 100644
--- a/task/src/main/java/com/sdm/task/dao/ProjectMapper.java
+++ b/task/src/main/java/com/sdm/task/dao/ProjectMapper.java
@@ -10,15 +10,15 @@ import java.util.List;
 @Mapper
 public interface ProjectMapper {
 
-    List<ProjectNodeBase> getNodeBaseChildren(@Param("parentNodeId") long parentNodeId, @Param("parentNodeLevel") int parentNodeLevel, @Param("company") String company);
+    List<ProjectNodeBase> getNodeBaseChildren(@Param("parentNodeId") long parentNodeId, @Param("parentNodeLevel") int parentNodeLevel, @Param("company") Long company);
 
-    List<TaskBase> getTaskByNodeId(@Param("nodeBaseId") long nodeBaseId, @Param("company") String company);
+    List<TaskBase> getTaskByNodeId(@Param("nodeBaseId") long nodeBaseId, @Param("company") Long company);
 
-    int updateProjectNodeExeStatus(@Param("nodeBaseId") long nodeBaseId, @Param("exeStatus") int exeStatus, @Param("updater") String updater, @Param("company") String company);
+    int updateProjectNodeExeStatus(@Param("nodeBaseId") long nodeBaseId, @Param("exeStatus") int exeStatus, @Param("updater") Long updater, @Param("company") Long company);
 
-    int updateProjectNodeStatus(@Param("nodeBaseId") long nodeBaseId, @Param("status") int status, @Param("updater") String updater, @Param("company") String company);
+    int updateProjectNodeStatus(@Param("nodeBaseId") long nodeBaseId, @Param("status") int status, @Param("updater") Long updater, @Param("company") Long company);
 
-    int updateProjectNodeFinishTime(@Param("nodeBaseId") long nodeBaseId, @Param("finishTime") String finishTime, @Param("updater") String updater, @Param("company") String company);
+    int updateProjectNodeFinishTime(@Param("nodeBaseId") long nodeBaseId, @Param("finishTime") String finishTime, @Param("updater") Long updater, @Param("company") Long company);
 
-    ProjectNodeBase getParentProjectNodeBase(@Param("nodeId") long nodeId, @Param("level") int level, @Param("company") String company);
+    ProjectNodeBase getParentProjectNodeBase(@Param("nodeId") long nodeId, @Param("level") int level, @Param("company") Long company);
 }
diff --git a/task/src/main/java/com/sdm/task/dao/TaskMapper.java b/task/src/main/java/com/sdm/task/dao/TaskMapper.java
index 2465a95b..69a5c0de 100644
--- a/task/src/main/java/com/sdm/task/dao/TaskMapper.java
+++ b/task/src/main/java/com/sdm/task/dao/TaskMapper.java
@@ -13,28 +13,28 @@ import java.util.List;
 
 @Mapper
 public interface TaskMapper {
-    int addTaskBaseBatch(@Param("bases") List<TaskBase> bases, @Param("company") String company);
+    int addTaskBaseBatch(@Param("bases") List<TaskBase> bases, @Param("company") Long company);
 
-    int addTaskMemberBatch(@Param("members") List<TaskMember> members, @Param("company") String company);
+    int addTaskMemberBatch(@Param("members") List<TaskMember> members, @Param("company") Long company);
 
-    int addProjectNodeTaskRelateBatch(@Param("relates") List<ProjectNodeTaskRelate> relates, @Param("company") String company);
+    int addProjectNodeTaskRelateBatch(@Param("relates") List<ProjectNodeTaskRelate> relates, @Param("company") Long company);
 
-    int addTaskExpandBatch(@Param("expands") List<TaskExpand> expands, @Param("company") String company);
+    int addTaskExpandBatch(@Param("expands") List<TaskExpand> expands, @Param("company") Long company);
 
-    int updateTaskBase(@Param("base") TaskBase base, @Param("updater") String updater, @Param("company") String company);
+    int updateTaskBase(@Param("base") TaskBase base, @Param("updater") Long updater, @Param("company") Long company);
 
     ProjectNodeBase getTaskParentNode(@Param("taskId") long taskId);
 
-    int updateTaskExpand(@Param("expand") TaskExpand expand, @Param("updater") String updater, @Param("company") String company);
+    int updateTaskExpand(@Param("expand") TaskExpand expand, @Param("updater") Long updater, @Param("company") Long company);
 
-    int delTaskExpandBatch(@Param("expandIds") List<Long> expandIds, @Param("company") String company);
+    int delTaskExpandBatch(@Param("expandIds") List<Long> expandIds, @Param("company") Long company);
 
-    TaskBase getTaskById(@Param("taskId") long taskId, @Param("company") String company);
+    TaskBase getTaskById(@Param("taskId") long taskId, @Param("company") Long company);
 
-    int delTaskById(@Param("taskId") long taskId, @Param("company") String company);
+    int delTaskById(@Param("taskId") long taskId, @Param("company") Long company);
 
-    List<PerformanceBase> getTaskPerformance(@Param("taskId") long taskId, @Param("company") String company);
+    List<PerformanceBase> getTaskPerformance(@Param("taskId") long taskId, @Param("company") Long company);
 
     int updatePerformance(@Param("performanceId") long performanceId, @Param("unit") String unit, @Param("lowValue") String lowValue, @Param("highValue") String highValue, @Param("description") String description,
-                          @Param("englishName") String englishName, @Param("method") String method, @Param("status") int status, @Param("value") String value, @Param("updater") String updater);
+                          @Param("englishName") String englishName, @Param("method") String method, @Param("status") int status, @Param("value") String value, @Param("updater") Long updater);
 }
diff --git a/task/src/main/java/com/sdm/task/service/impl/TaskServiceImpl.java b/task/src/main/java/com/sdm/task/service/impl/TaskServiceImpl.java
index d5317a4c..6da17a19 100644
--- a/task/src/main/java/com/sdm/task/service/impl/TaskServiceImpl.java
+++ b/task/src/main/java/com/sdm/task/service/impl/TaskServiceImpl.java
@@ -51,20 +51,20 @@ public class TaskServiceImpl implements TaskService {
     @Transactional
     @Override
     public SdmResponse addTask(AddTaskReq req) {
-        String company = ThreadLocalContext.getCompany();
+        Long tenantId = ThreadLocalContext.getTenantId();
         List<TaskBase> baseList = req.getBases();
-        int result = taskMapper.addTaskBaseBatch(baseList, company);
+        int result = taskMapper.addTaskBaseBatch(baseList, tenantId);
         if (result <= 0) {
             return SdmResponse.failed("新增任务失败！");
         }
-        result = taskMapper.addTaskMemberBatch(req.getTaskMembers(), company);
+        result = taskMapper.addTaskMemberBatch(req.getTaskMembers(), tenantId);
         if (result <= 0) {
             // 手动回滚事务
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return SdmResponse.failed("新增任务负责人失败！");
         }
         if (!CollectionUtils.isEmpty(req.getRelates())) {
-            result = taskMapper.addProjectNodeTaskRelateBatch(req.getRelates(), company);
+            result = taskMapper.addProjectNodeTaskRelateBatch(req.getRelates(), tenantId);
             if (result <= 0) {
                 // 手动回滚事务
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -72,14 +72,14 @@ public class TaskServiceImpl implements TaskService {
             }
         }
         if (!CollectionUtils.isEmpty(req.getExpands())) {
-            result = taskMapper.addTaskExpandBatch(req.getExpands(), company);
+            result = taskMapper.addTaskExpandBatch(req.getExpands(), tenantId);
             if (result <= 0) {
                 // 手动回滚事务
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return SdmResponse.failed("新增任务属性失败！");
             }
         }
-        String companyRootPath = Tools.getRootPath(rootPath, ThreadLocalContext.getCompany());
+        String companyRootPath = Tools.getRootPath(rootPath, String.valueOf(ThreadLocalContext.getTenantId()));
         for (TaskBase base : baseList) {
             commonService.createProjectDataDir(base.getTaskPath(), IData.DATA_TYPE.TASK, companyRootPath);
         }
@@ -88,22 +88,22 @@ public class TaskServiceImpl implements TaskService {
 
     @Override
     public SdmResponse updateTaskBatch(UpdateTaskBatchReq req) {
-        String updater = ThreadLocalContext.getJobNumber();
-        String company = ThreadLocalContext.getCompany();
+        Long updater = ThreadLocalContext.getUserId();
+        Long tenantId = ThreadLocalContext.getTenantId();
         if (!CollectionUtils.isEmpty(req.getTaskBases())) {
             req.getTaskBases().parallelStream().forEach(this::updateTask);
         }
         if (!CollectionUtils.isEmpty(req.getUpdateTaskExpands())) {
-            req.getUpdateTaskExpands().parallelStream().forEach(taskExpand -> taskMapper.updateTaskExpand(taskExpand, updater, company));
+            req.getUpdateTaskExpands().parallelStream().forEach(taskExpand -> taskMapper.updateTaskExpand(taskExpand, updater, tenantId));
         }
         if (!CollectionUtils.isEmpty(req.getAddTaskExpands())) {
-            int result = taskMapper.addTaskExpandBatch(req.getAddTaskExpands(), company);
+            int result = taskMapper.addTaskExpandBatch(req.getAddTaskExpands(), tenantId);
             if (result <= 0) {
                 return SdmResponse.failed("新增任务属性失败！");
             }
         }
         if (!CollectionUtils.isEmpty(req.getDelTaskExpandIds())) {
-            int result = taskMapper.delTaskExpandBatch(req.getDelTaskExpandIds(), company);
+            int result = taskMapper.delTaskExpandBatch(req.getDelTaskExpandIds(), tenantId);
             if (result <= 0) {
                 return SdmResponse.failed("删除任务属性失败！");
             }
@@ -112,8 +112,8 @@ public class TaskServiceImpl implements TaskService {
     }
 
     private void updateTask(TaskBase taskBase) {
-        TaskBase oldBase = taskMapper.getTaskById(taskBase.getId(), ThreadLocalContext.getCompany());
-        taskMapper.updateTaskBase(taskBase, ThreadLocalContext.getJobNumber(), ThreadLocalContext.getCompany());
+        TaskBase oldBase = taskMapper.getTaskById(taskBase.getId(), ThreadLocalContext.getTenantId());
+        taskMapper.updateTaskBase(taskBase, ThreadLocalContext.getUserId(), ThreadLocalContext.getTenantId());
         ProjectNodeBase projectNodeBase = taskMapper.getTaskParentNode(taskBase.getId());
         reverseUpdateUp(projectNodeBase, oldBase.getExeStatus() != taskBase.getExeStatus(),
                 oldBase.getStatus() != taskBase.getStatus(), !StringUtils.equals(oldBase.getFinishTime(), taskBase.getFinishTime()));
@@ -122,9 +122,9 @@ public class TaskServiceImpl implements TaskService {
 
     // 向上更新
     private void reverseUpdateUp(ProjectNodeBase parentNode, boolean updateExeStatus, boolean updateStatus, boolean updateFinishTime) {
-        String company = ThreadLocalContext.getCompany();
-        List<ProjectNodeBase> nodeBases = projectMapper.getNodeBaseChildren(parentNode.getId(), parentNode.getLevel(), company);
-        List<TaskBase> taskBases = projectMapper.getTaskByNodeId(parentNode.getId(), company);
+        Long tenantId = ThreadLocalContext.getTenantId();
+        List<ProjectNodeBase> nodeBases = projectMapper.getNodeBaseChildren(parentNode.getId(), parentNode.getLevel(), tenantId);
+        List<TaskBase> taskBases = projectMapper.getTaskByNodeId(parentNode.getId(), tenantId);
         if (CollectionUtils.isEmpty(nodeBases)) {
             return;
         }
@@ -143,7 +143,7 @@ public class TaskServiceImpl implements TaskService {
                     newExeStatus = 2;
                 }
                 if (newExeStatus != parentNode.getExeStatus()) {
-                    projectMapper.updateProjectNodeExeStatus(parentNode.getId(), newExeStatus, ThreadLocalContext.getJobNumber(), company);
+                    projectMapper.updateProjectNodeExeStatus(parentNode.getId(), newExeStatus, ThreadLocalContext.getUserId(), tenantId);
                 } else {
                     updateExeStatus = false;
                 }
@@ -155,7 +155,7 @@ public class TaskServiceImpl implements TaskService {
             taskBases.forEach(a -> statuses.add(a.getStatus()));
             int nodeStatus = confirmStatus(statuses);
             if (nodeStatus != parentNode.getStatus()) {
-                projectMapper.updateProjectNodeStatus(parentNode.getId(), nodeStatus, ThreadLocalContext.getJobNumber(), company);
+                projectMapper.updateProjectNodeStatus(parentNode.getId(), nodeStatus, ThreadLocalContext.getUserId(), tenantId);
             } else {
                 updateStatus = false;
             }
@@ -182,12 +182,12 @@ public class TaskServiceImpl implements TaskService {
                 }
             }
             if (finished) {
-                projectMapper.updateProjectNodeFinishTime(parentNode.getId(), lastFinishTime, ThreadLocalContext.getJobNumber(), company);
+                projectMapper.updateProjectNodeFinishTime(parentNode.getId(), lastFinishTime, ThreadLocalContext.getUserId(), tenantId);
             } else {
                 updateFinishTime = false;
             }
         }
-        ProjectNodeBase node = projectMapper.getParentProjectNodeBase(parentNode.getId(), parentNode.getLevel(), company);
+        ProjectNodeBase node = projectMapper.getParentProjectNodeBase(parentNode.getId(), parentNode.getLevel(), tenantId);
         if (node != null && (updateExeStatus || updateStatus || updateFinishTime)) {
             reverseUpdateUp(node, updateExeStatus, updateStatus, updateFinishTime);
         }
@@ -210,16 +210,16 @@ public class TaskServiceImpl implements TaskService {
     @Override
     public SdmResponse delTask(DelTaskReq req) {
         // todo 权限控制
-        String company = ThreadLocalContext.getCompany();
-        TaskBase taskBase = taskMapper.getTaskById(req.getTaskId(), ThreadLocalContext.getCompany());
+        Long tenantId = ThreadLocalContext.getTenantId();
+        TaskBase taskBase = taskMapper.getTaskById(req.getTaskId(), ThreadLocalContext.getTenantId());
         if (ObjectUtils.isEmpty(taskBase)) {
             return SdmResponse.failed("任务不存在！");
         }
-        int result = taskMapper.delTaskById(req.getTaskId(), company);
+        int result = taskMapper.delTaskById(req.getTaskId(), tenantId);
         if (result <= 0) {
             return SdmResponse.failed("删除任务失败！");
         }
-        File taskFile = new File(Tools.getRootPath(rootPath, company) + File.separator + taskBase.getTaskPath());
+        File taskFile = new File(Tools.getRootPath(rootPath, String.valueOf(tenantId)) + File.separator + taskBase.getTaskPath());
         boolean del = Tools.reverseDelFiles(taskFile);
         if (!del) {
             return SdmResponse.failed("删除任务文件失败");
@@ -232,28 +232,28 @@ public class TaskServiceImpl implements TaskService {
     public SdmResponse relateTaskAndRun(RelateTaskAndRunReq req) {
         long taskId = req.getTaskId();
         long runId = req.getRunId();
-        String company = ThreadLocalContext.getCompany();
-        TaskBase taskBase = taskMapper.getTaskById(taskId, company);
+        Long tenantId = ThreadLocalContext.getTenantId();
+        TaskBase taskBase = taskMapper.getTaskById(taskId, tenantId);
         if (ObjectUtils.isEmpty(taskBase)) {
             return SdmResponse.failed("任务不存在");
         }
-        PbsRun pbsRun = pbsMapper.getPbsRunById(req.getRunId(), company);
+        PbsRun pbsRun = pbsMapper.getPbsRunById(req.getRunId(), tenantId);
         if (ObjectUtils.isEmpty(pbsRun)) {
             return SdmResponse.failed("算例不存在");
         }
-        int baseRunCount = pbsMapper.getBaseRunCount(taskId, company);
+        int baseRunCount = pbsMapper.getBaseRunCount(taskId, tenantId);
         if (req.getBase() == 1 && baseRunCount > 0) {
             return SdmResponse.failed("归档基础算例已存在");
         }
         if (pbsMapper.updateTaskAndRunRelate(runId, taskId) <= 0){
             return SdmResponse.failed("归档算例失败");
         }
-        List<PerformanceBase> performanceBases = taskMapper.getTaskPerformance(taskId, company);
+        List<PerformanceBase> performanceBases = taskMapper.getTaskPerformance(taskId, tenantId);
         for (PerformanceBase base : req.getPerformanceBaseList()) {
             for (PerformanceBase performanceBase : performanceBases) {
                 if (base.getPerformanceName().equals(performanceBase.getPerformanceName())) {
                     taskMapper.updatePerformance(performanceBase.getId(), base.getUnit(), base.getLowValue(), base.getHighValue(),
-                            base.getLowValue(), base.getEnglishName(), base.getMethod(), base.getStatus(), base.getValue(), ThreadLocalContext.getJobNumber());
+                            base.getLowValue(), base.getEnglishName(), base.getMethod(), base.getStatus(), base.getValue(), ThreadLocalContext.getUserId());
                     // 更新状态 向上更新任务和节点状态
                     if (base.getStatus() != performanceBase.getStatus()) {
                         ProjectNodeBase projectNodeBase = taskMapper.getTaskParentNode(taskId);