From cd95fa25d9e46750b7c5f9982ca825d03782bc2a Mon Sep 17 00:00:00 2001 From: zhal <15900249928@163.com> Date: Wed, 20 Jul 2022 20:17:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=B2=97=E4=BD=8D?= =?UTF-8?q?=E5=8E=BB=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/coe/pal/pal/repository/job/SynchronousOrgJob.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 02787d27..294e528d 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 @@ -227,7 +227,7 @@ public class SynchronousOrgJob implements IJob { } - List orgdepartmentList=DBSql.getMaps("select POSITION_NO,POSITION_NAME from ORGUSER WHERE DEPARTMENTID=?",departmentId); + List orgdepartmentList=DBSql.getMaps("select DISTINCT(POSITION_NAME) from ORGUSER WHERE DEPARTMENTID=?",departmentId); JSONArray shapes = new JSONArray(); if(orgdepartmentList.size()>0){ From 5b05527370bab595d0ec7641289c4953c39807aa Mon Sep 17 00:00:00 2001 From: zhal <15900249928@163.com> Date: Wed, 20 Jul 2022 21:08:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=B2=97=E4=BD=8D?= =?UTF-8?q?=E5=8E=BB=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/coe/pal/pal/repository/job/SynchronousOrgJob.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 294e528d..a055cc78 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 @@ -73,7 +73,7 @@ public class SynchronousOrgJob implements IJob { PALRepositoryModelImpl model = CoeProcessLevelUtil.createPALRepositoryModel(id1, plRid1, wsId, "内蒙古伊利实业集团股份有限公司", - "", 1, modeldefaultId, "org", true, 1, + "", orderIndex, modeldefaultId, "org", true, 1, id1, false, "org.normal", "0", 1, null, null, "admin", "admin", nowTime, "0", null, null, null, null, null, null, null, null, 1);