Merge branch 'fixbug_0525' into developer

haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml

@@ -275,7 +275,7 @@
 
     <select id="pageStaff" resultMap="BaseResultMap">
         select
-        <include refid="Base_Column_List"/>
+        a.*
         from tab_haoban_staff a
         left join tab_haoban_staff_department_related b on a.staff_id = b.staff_id
         where a.status_flag = 1 and a.wx_enterprise_id = #{wxEnterpriseId}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java

@@ -146,8 +146,15 @@ public class StaffController extends WebBaseController {
         }
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
-        // 部门
-        List<String> departmentIds = departmentApiService.listSonDeptIdsByDepartmentId(departmentId, wxEnterpriseId);
+        List<String> departmentIds = new ArrayList<>();
+        DepartmentDTO departmentDTO = departmentApiService.selectById(departmentId);
+        if (departmentDTO != null) {
+            String parentDepartmentId = departmentDTO.getParentDepartmentId();
+            if (!"0".equals(parentDepartmentId)) {
+                // 部门
+                departmentIds = departmentApiService.listSonDeptIdsByDepartmentId(departmentId, wxEnterpriseId);
+            }
+        }
         //员工
         Page<StaffDTO> page = staffApiService.pageStaff(departmentIds, activeFlag, keyWord, pageInfo, relationFlag,wxEnterpriseId);