From 71792fb2b05bf4c52925c065410c0535b6ae612b Mon Sep 17 00:00:00 2001
From: zhal <15900249928@163.com>
Date: Fri, 15 Jul 2022 13:41:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8=E5=BC=80=E5=85=B3?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pal/repository/job/SynchronousOrgJob.java | 22 +++++--------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousOrgJob.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousOrgJob.java
index 00d7ca72..06831f5d 100644
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousOrgJob.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousOrgJob.java
@@ -88,11 +88,10 @@ public class SynchronousOrgJob implements IJob {
         String id1 = UUIDGener.getUUID();
         Timestamp nowTime = new Timestamp(System.currentTimeMillis());
 
-        Connection open = DBSql.open();
 
         if (org.getString("PARENTDEPARTMENTID").equals("0")) {
             String sql1 = "SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE WSID='6f4e292c-1b90-4dd2-8c20-7da159cb20a5' and EXT1='" + org.getString("ID") + "'";
-            String parentPalOrgId1 = DBSql.getString(open,sql1);
+            String parentPalOrgId1 = DBSql.getString(sql1);
             if(StringUtil.isEmpty(parentPalOrgId1)){
                 PALRepositoryModelImpl model1 = CoeProcessLevelUtil.createPALRepositoryModel(id1, plRid1, "6f4e292c-1b90-4dd2-8c20-7da159cb20a5", org.getString("DEPARTMENTNAME"),
                         "", 1, parentModelId, "org", true, 1,
@@ -104,8 +103,6 @@ public class SynchronousOrgJob implements IJob {
                 return modelId=model1.getId();
             }
 
-            DBSql.close(open);
-
         } else {
 
             String parentPalOrgId = getParentPalOrgId(org);
@@ -134,33 +131,28 @@ public class SynchronousOrgJob implements IJob {
 
     public String getParentPalOrgId(RowMap org) {
 
-        Connection open = DBSql.open();
         String sql = "SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE WSID='6f4e292c-1b90-4dd2-8c20-7da159cb20a5' and EXT1='" + org.getString("PARENTDEPARTMENTID") + "'";
-        String parentPalOrgId = DBSql.getString(open,sql);
+        String parentPalOrgId = DBSql.getString(sql);
 
         if (parentPalOrgId.equals("0") || parentPalOrgId.equals("") || parentPalOrgId == null) {
             RowMap parentOrg = DBSql.getMap("select DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID,ORDERINDEX from ORGDEPARTMENT where id = '" + org.getString("PARENTDEPARTMENTID") + "'");
             creatNode(parentOrg);
         }
 
-        DBSql.close(open);
-
         return parentPalOrgId;
     }
 
 
     public String getParentPallevel(RowMap org) {
-        Connection open = DBSql.open();
         String sql = "SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE WSID='6f4e292c-1b90-4dd2-8c20-7da159cb20a5' and EXT1='" + org.getString("PARENTDEPARTMENTID") + "'";
-        String parentPalOrgId = DBSql.getString(open,sql);
+        String parentPalOrgId = DBSql.getString(sql);
 
         if (parentPalOrgId.equals("0") || parentPalOrgId.equals("") || parentPalOrgId == null) {
-            RowMap parentOrg = DBSql.getMap(open,"select DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID from ORGDEPARTMENT where id = '" + org.getString("PARENTDEPARTMENTID") + "'");
+            RowMap parentOrg = DBSql.getMap("select DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID from ORGDEPARTMENT where id = '" + org.getString("PARENTDEPARTMENTID") + "'");
 
             creatNode(parentOrg);
         }
 
-        DBSql.close(open);
         return parentPalOrgId;
     }
 
@@ -172,8 +164,6 @@ public class SynchronousOrgJob implements IJob {
      */
     public void createPostData(String uuid,String departmentId,PALRepositoryModelImpl model){
 
-        Connection open = DBSql.open();
-
         Map<String, String> idRelationMap = new HashMap<>();
 
         BaseModel defineModel = CoeDesignerAPIManager.getInstance().getDefinition(model.getId(), 0);
@@ -196,8 +186,7 @@ public class SynchronousOrgJob implements IJob {
         }
 
 
-
-        List<RowMap> orgdepartmentList=DBSql.getMaps(open,"select POSITION_NO,POSITION_NAME from ORGUSER WHERE DEPARTMENTID=?",departmentId);
+        List<RowMap> orgdepartmentList=DBSql.getMaps("select POSITION_NO,POSITION_NAME from ORGUSER WHERE DEPARTMENTID=?",departmentId);
 
         int zindex = 1;
 
@@ -238,7 +227,6 @@ public class SynchronousOrgJob implements IJob {
         // 保存文件
         CoeDesignerAPIManager.getInstance().storeDefinition(defineModel);// dao操作
 
-        DBSql.close(open);
     }
 
 }