Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -11898,6 +11898,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 }
             }
         }
+        if(departmentId!=null){
+            deptIds=new ArrayList<>();
+            List<Integer> branchDepartment = getBranchDepartment(departmentId, allDepartmentList);
+            deptIds.addAll(branchDepartment);
+        }
         long total  = 0;
         List<Map<String,Object>> resultList = null;
         String startDate = null;

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -1798,9 +1798,9 @@
                 #{item}
             </foreach>
         </if>
-        <if test="departmentId!=null">
-            and u.department_id=#{departmentId}
-        </if>
+<!--        <if test="departmentId!=null">-->
+<!--            and u.department_id=#{departmentId}-->
+<!--        </if>-->
         <if test="sortProp!=null and sortProp!=''">
             <choose>
                 <when test="sortOrder==0">