Merge branch 'dev_dispatch_filter0711' into 'develop'

增加状态判断

See merge request !208

project-order/src/main/java/com/dituhui/pea/order/entity/OrgTeam.java

@@ -17,6 +17,7 @@ public class OrgTeam {
 	private String workdays;
 	private String memo;
 	private String workOn;
+	private Integer status;
 	private Timestamp createTime;
 	private Timestamp updateTime;
 }

project-order/src/main/java/com/dituhui/pea/order/service/impl/ScheduleServiceImpl.java

@@ -208,6 +208,7 @@ public class ScheduleServiceImpl implements ScheduleService {
 		IPage<OrgTeam> pg = new Page<>(page, size);
 
 		LambdaQueryWrapper<OrgTeam> lqw = new LambdaQueryWrapper<>();
+		lqw.eq(OrgTeam::getStatus, 1);
 		lqw.in(levelType.equals("cluster"), OrgTeam::getClusterId, levelIds);
 		lqw.in(levelType.equals("branch"), OrgTeam::getBranchId, levelIds);
 		lqw.in(levelType.equals("group"), OrgTeam::getGroupId, levelIds);