From 433e1e987f1c0bf9d7ee163200c67a8d69fe621b Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 23 六月 2026 18:42:29 +0800
Subject: [PATCH] 【市一】外链开放机构号生成

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java
index 5a91def..0b98aaa 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceOutPathController.java
@@ -7,6 +7,7 @@
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.RSAPublicKeyExample;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.smartor.domain.BaseOrganization;
@@ -18,8 +19,10 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -42,6 +45,12 @@
 
     @Autowired
     private IBaseOrganizationService baseOrganizationService;
+
+    @Autowired
+    private RSAPublicKeyExample rsaPublicKeyExample;
+
+    @Value("${pri_key}")
+    private String pri_key;
 
     /**
      * 鏌ヨ涓婚敭鍒楄〃
@@ -70,22 +79,15 @@
             ServiceOutPath serviceOutPath1 = list.get(0);
             serviceOutPath1.setId(null);
             serviceOutPath1.setRadix(null);
-            //鏍规嵁taskid鑾峰彇鏈烘瀯淇℃伅
-            if(StringUtils.isNotEmpty(serviceOutPath1.getParam1())){
-                String taskId = serviceOutPath1.getParam1();
-                if(StringUtils.isNotEmpty(taskId)){
-                    ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(Long.valueOf(taskId));
-                    String orgId = serviceTask.getOrgid();
-                    if(StringUtils.isNotEmpty(orgId)){
-                        BaseOrganization baseOrganization = new BaseOrganization();
-                        baseOrganization.setOrgid(orgId);
-                        List<BaseOrganization> orgs = baseOrganizationService.selectBaseOrganizationList(baseOrganization);
-                        if(CollectionUtils.isNotEmpty(orgs)){
-                            String orgname = orgs.get(0).getOrganizationName();
-                            serviceOutPath1.setOrgid(orgId);
-                            serviceOutPath1.setOrgname(orgname);
-                        }
-                    }
+            if(StringUtils.isNotEmpty(serviceOutPath1.getOrgid())){
+                String orgId = serviceOutPath1.getOrgid();
+                BaseOrganization baseOrganization = new BaseOrganization();
+                baseOrganization.setOrgid(orgId);
+                List<BaseOrganization> orgs = baseOrganizationService.selectBaseOrganizationList(baseOrganization);
+                if(CollectionUtils.isNotEmpty(orgs)){
+                    String orgname = orgs.get(0).getOrganizationName();
+                    serviceOutPath1.setOrgid(orgId);
+                    serviceOutPath1.setOrgname(orgname);
                 }
             }
             return success(serviceOutPath1);

--
Gitblit v1.9.3