Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/project/business/turnover/controller/BizTurnoverController.java

@@ -46,6 +46,7 @@ public class BizTurnoverController extends BaseController {
         }
 
         queryWrapper.eq("dept_id", deptId);
+        queryWrapper.eq("status",0);
         if (tenantId != null && !zero.toString().equals(tenantId)) {
             queryWrapper.eq("tenant_id", Long.valueOf(tenantId));
         }

src/main/resources/mybatis/system/SysDeptMapper.xml

@@ -164,7 +164,7 @@
               FROM biz_technological_process_detail btpd
                        INNER JOIN biz_production_plan_detail bppd
                                   ON bppd.technological_process_id = btpd.technological_process_id
-              WHERE bppd.id = #{productionPlanDetailId}) AS m ON m.process_id = dp.process_id AND d.is_work_section = 1 AND d.tenant_id = #{tenantId}
+              WHERE bppd.id = #{productionPlanDetailId} and btpd.tenant_id !=9) AS m ON m.process_id = dp.process_id AND d.is_work_section = 1 AND d.tenant_id = #{tenantId}
     </select>
 	<select id="selectDeptListByTechnologyWasteRecyclingId" resultType="cn.ezhizao.project.system.domain.SysDept">
 		SELECT DISTINCT dp.dept_id, d.dept_name, d.workshop_id