部门新增职能部门字段

airport-common/src/main/java/com/sundot/airport/common/core/domain/entity/SysDept.java

@@ -94,6 +94,11 @@ public class SysDept extends BaseEntity {
      */
     private String brigadeNature;
 
+    /**
+     * 职能部门（0否 1是）
+     */
+    private String isFunctionalDept;
+
     public Long getDeptId() {
         return deptId;
     }
@@ -220,6 +225,14 @@ public class SysDept extends BaseEntity {
         this.brigadeNature = brigadeNature;
     }
 
+    public String getIsFunctionalDept() {
+        return isFunctionalDept;
+    }
+
+    public void setIsFunctionalDept(String isFunctionalDept) {
+        this.isFunctionalDept = isFunctionalDept;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -240,6 +253,7 @@ public class SysDept extends BaseEntity {
                 .append("deptType", getDeptType())
                 .append("deptTypeDesc", getDeptTypeDesc())
                 .append("brigadeNature", getBrigadeNature())
+                .append("isFunctionalDept", getIsFunctionalDept())
                 .toString();
     }
 }

airport-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -23,6 +23,7 @@
         <result property="deptType" column="dept_type"/>
         <result property="deptTypeDesc" column="dept_type_desc"/>
         <result property="brigadeNature" column="brigade_nature"/>
+        <result property="isFunctionalDept" column="is_functional_dept"/>
     </resultMap>
 
     <sql id="selectDeptVo">
@@ -40,7 +41,8 @@
                d.create_time,
                d.dept_type,
                d.dept_type_desc,
-               d.brigade_nature
+               d.brigade_nature,
+               d.is_functional_dept
         from sys_dept d
     </sql>
 
@@ -68,6 +70,9 @@
         <if test="brigadeNature != null and brigadeNature != ''">
             AND brigade_nature = #{brigadeNature}
         </if>
+        <if test="isFunctionalDept != null and isFunctionalDept != ''">
+            AND is_functional_dept = #{isFunctionalDept}
+        </if>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
         order by d.parent_id, d.order_num
@@ -98,6 +103,7 @@
                d.dept_type,
                d.dept_type_desc,
                d.brigade_nature,
+               d.is_functional_dept,
                (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
         from sys_dept d
         where d.dept_id = #{deptId}
@@ -163,6 +169,7 @@
         <if test="deptType != null and deptType != ''">dept_type,</if>
         <if test="deptTypeDesc != null and deptTypeDesc != ''">dept_type_desc,</if>
         <if test="brigadeNature != null and brigadeNature != ''">brigade_nature,</if>
+        <if test="isFunctionalDept != null and isFunctionalDept != ''">is_functional_dept,</if>
         create_time
         )values(
         <if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -178,6 +185,7 @@
         <if test="deptType != null and deptType != ''">#{deptType},</if>
         <if test="deptTypeDesc != null and deptTypeDesc != ''">#{deptTypeDesc},</if>
         <if test="brigadeNature != null and brigadeNature != ''">#{brigadeNature},</if>
+        <if test="isFunctionalDept != null and isFunctionalDept != ''">#{isFunctionalDept},</if>
         sysdate()
         )
     </insert>
@@ -197,6 +205,7 @@
             <if test="deptType != null and deptType != ''">dept_type = #{deptType},</if>
             <if test="deptTypeDesc != null and deptTypeDesc != ''">dept_type_desc = #{deptTypeDesc},</if>
             <if test="brigadeNature != null and brigadeNature != ''">brigade_nature = #{brigadeNature},</if>
+            <if test="isFunctionalDept != null and isFunctionalDept != ''">is_functional_dept = #{isFunctionalDept},</if>
             update_time = sysdate()
         </set>
         where dept_id = #{deptId}
@@ -264,6 +273,7 @@
         d.dept_type,
         d.dept_type_desc,
         d.brigade_nature,
+        d.is_functional_dept,
         (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
         from sys_dept d
         where d.dept_id in