yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/apps_dev' into apps_dev

Browse Source
This commit is contained in:
3120626891@qq.com 2022-07-20 21:34:09 +08:00
commit 9a57d7b1af
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousOrgJob.java
View File

@ -73,7 +73,7 @@ public class SynchronousOrgJob implements IJob {
PALRepositoryModelImpl model = CoeProcessLevelUtil.createPALRepositoryModel(id1, plRid1, wsId, "内蒙古伊利实业集团股份有限公司", PALRepositoryModelImpl model = CoeProcessLevelUtil.createPALRepositoryModel(id1, plRid1, wsId, "内蒙古伊利实业集团股份有限公司",
"", 1, modeldefaultId, "org", true, 1, "", orderIndex, modeldefaultId, "org", true, 1,
id1, false, "org.normal", "0", 1, null, id1, false, "org.normal", "0", 1, null,
null, "admin", "admin", nowTime, "0", null, null, "admin", "admin", nowTime, "0", null,
null, null, null, null, null, null, null, 1); null, null, null, null, null, null, null, 1);
@ -227,7 +227,7 @@ public class SynchronousOrgJob implements IJob {
} }
List<RowMap> orgdepartmentList=DBSql.getMaps("select POSITION_NO,POSITION_NAME from ORGUSER WHERE DEPARTMENTID=?",departmentId); List<RowMap> orgdepartmentList=DBSql.getMaps("select DISTINCT(POSITION_NAME) from ORGUSER WHERE DEPARTMENTID=?",departmentId);
JSONArray shapes = new JSONArray(); JSONArray shapes = new JSONArray();
if(orgdepartmentList.size()>0){ if(orgdepartmentList.size()>0){