diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/dto/DeptDTO.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/dto/DeptDTO.java
index 65329ed28..67bff3ac1 100644
--- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/dto/DeptDTO.java
+++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/dto/DeptDTO.java
@@ -24,6 +24,8 @@ public class DeptDTO implements Serializable {
 
     private String name;
 
+    private String code;
+
     private String area;
 
     private String remark;
diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/po/Dept.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/po/Dept.java
index 89a89341c..de38c53dd 100644
--- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/po/Dept.java
+++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/po/Dept.java
@@ -41,7 +41,6 @@ public class Dept extends BaseEntity {
     /**
      * 部门编号
      */
-    @TableField(exist=false)
     private String code;
 
     /**
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml
index c055665c0..6ab632977 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml
@@ -12,12 +12,12 @@
           AND ${ew.sqlSegment}
     </select>
 
-<!--    &lt;!&ndash;查询排序&ndash;&gt;-->
-<!--    <select id="getSortNum" resultType="int">-->
-<!--        SELECT MAX(sys_dept.sort) sort-->
-<!--        FROM sys_dept sys_dept-->
-<!--        WHERE sys_dept.state = 1-->
-<!--    </select>-->
+    <!--    &lt;!&ndash;查询排序&ndash;&gt;-->
+    <!--    <select id="getSortNum" resultType="int">-->
+    <!--        SELECT MAX(sys_dept.sort) sort-->
+    <!--        FROM sys_dept sys_dept-->
+    <!--        WHERE sys_dept.state = 1-->
+    <!--    </select>-->
 
     <select id="getIdString" resultType="String">
         SELECT sys_dept.pids pids
@@ -28,33 +28,32 @@
 
     <select id="getDeptTree" resultType="DeptTreeVO">
         SELECT
-            T3.*,
-            T5.id area,
-            T5.name areaName
+        T3.*,
+        T5.id area,
+        T5.NAME areaName
         FROM
-            (
-                SELECT
-                    @codes AS _ids,
-            (
-                SELECT @codes := GROUP_CONCAT( id ) FROM sys_dept WHERE FIND_IN_SET( pid, @codes ) ) AS T1
-                      FROM
-                        sys_dept s,
-                        ( SELECT @codes := #{id} ) T4
-                      WHERE
-                        @codes IS NOT NULL
-                        <if test="type != null">
-                            AND s.type in
-                            <foreach collection="type" item="item" open="(" close=")" separator=",">
-                                #{item}
-                            </foreach>
-                        </if>
-                        ) T2,
-                        sys_dept T3,
-                        sys_area T5
+        sys_dept T3,
+        sys_area T5
         WHERE
-            FIND_IN_SET( T3.id, T2._ids )
-            AND t3.area = t5.id
-            AND t3.State = 1
+        FIND_IN_SET( #{id}, T3.pids )
+        and t3.type in
+        <foreach collection="type" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        AND t3.area = t5.id
+        AND t3.State = 1
+        UNION
+        SELECT
+        T3.*,
+        T5.id area,
+        T5.NAME areaName
+        FROM
+        sys_dept T3,
+        sys_area T5
+        WHERE
+        t3.area = t5.id
+        and T3.id = #{id}
+        AND t3.State = 1
     </select>
 
     <select id="getAllDeptTree" resultType="DeptAllTreeVO">
@@ -121,38 +120,39 @@
 
     <select id="getDeptDescendantIndexes" resultType="DeptDTO">
         SELECT
-            T3.id,
-            T3.pid,
-            T3.pids,
-            T3.NAME,
-            T3.type,
-            T5.NAME area ,
-            T3.Remark,
-            T3.sort
+        T3.id,
+        T3.pid,
+        T3.pids,
+        T3.NAME,
+        T3.code,
+        T3.type,
+        T5.NAME area ,
+        T3.Remark,
+        T3.sort
         FROM
-            (
-                SELECT
-                    @codes AS _ids,
-		    (
-		        SELECT @codes := GROUP_CONCAT( id ) FROM sys_dept WHERE FIND_IN_SET( pid, @codes ) ) AS T1
-                    FROM
-                        sys_dept s,
-                        ( SELECT @codes := #{id} ) T4
-                    WHERE
-                        @codes IS NOT NULL
-                    <if test="type != null">
-                        AND s.type in
-                        <foreach collection="type" item="item" open="(" close=")" separator=",">
-                            #{item}
-                        </foreach>
-                    </if>
-            ) T2,
-            sys_dept T3,
-            sys_area T5
+        (
+        SELECT
+        @codes AS _ids,
+        (
+        SELECT @codes := GROUP_CONCAT( id ) FROM sys_dept WHERE FIND_IN_SET( pid, @codes ) ) AS T1
+        FROM
+        sys_dept s,
+        ( SELECT @codes := #{id} ) T4
         WHERE
-            FIND_IN_SET( T3.id, T2._ids )
-            AND t3.area = t5.id
-            AND t3.State = 1
+        @codes IS NOT NULL
+        <if test="type != null">
+            AND s.type in
+            <foreach collection="type" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        ) T2,
+        sys_dept T3,
+        sys_area T5
+        WHERE
+        FIND_IN_SET( T3.id, T2._ids )
+        AND t3.area = t5.id
+        AND t3.State = 1
         Order by T3.sort asc
     </select>