diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java
index b25812e4e..8d8f5a9d9 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java
@@ -185,7 +185,8 @@ public class FlowOrgRepositoryServiceImpl implements OrgRepositoryService {
     public List<DeptDo> getSysAllDepts() {
         try {
             return xzProjectOrgMapper.selectList(null).stream()
-                    .map(d -> new DeptDo(d.getId().toString(), d.getDeptName(), "", d.getParentId().toString()))
+                    .map(d -> new DeptDo(d.getId().toString(), d.getDeptName(), d.getLeader() == null ?
+                            null : d.getLeader().toString(), d.getParentId().toString()))
                     .collect(Collectors.toList());
         } catch (Exception e) {
             return Collections.emptyList();
@@ -196,7 +197,7 @@ public class FlowOrgRepositoryServiceImpl implements OrgRepositoryService {
     public List<UserDeptDo> getSysAllUserDepts() {
         try {
             return systemUserMapper.selectList(null).stream()
-                    .map(d -> new UserDeptDo(d.getUserId().toString(), d.getDepartment()))
+                    .map(d -> new UserDeptDo(d.getUserId().toString(), d.getXzProjectOrgId() == null ? null : d.getXzProjectOrgId().toString()))
                     .collect(Collectors.toList());
         } catch (Exception e) {
             return Collections.emptyList();
diff --git a/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar b/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar
index a13fccf84..4a161612d 100644
Binary files a/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar and b/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar differ