优化枚举类校验;优化Swagger配置,添加默认参数;fix删除部门;优化ResponseDTO;

smart-admin-service/smart-admin-api/src/main/resources/mapper/system/department/DepartmentMapper.xml

@@ -18,15 +18,6 @@
         d.create_time
     </sql>
 
-    <select id="countSubDepartment" resultType="integer">
-        SELECT
-        count(1)
-        FROM
-        t_department
-        WHERE
-        parent_id = #{departmentId}
-    </select>
-
     <select id="listAll" resultMap="DepartmentVO">
         SELECT
         <include refid="baseSql"></include>,
@@ -50,5 +41,14 @@
     </select>
 
 
+    <select id="countSubDepartment" resultType="java.lang.Integer">
+        SELECT
+        count(1)
+        FROM
+        t_department
+        WHERE
+        parent_id = #{deptId}
+    </select>
+
 
 </mapper>

smart-admin-service/smart-admin-api/src/main/resources/mapper/system/employee/EmployeeMapper.xml

@@ -124,7 +124,10 @@
         FROM
         t_employee e
         WHERE
-        e.department_id = #{departmentId}
+        e.department_id = #{depId}
+        <if test="deleteFlag != null">
+            AND e.is_delete = #{deleteFlag}
+        </if>
     </select>