0611

src/main/java/cn/ezhizao/project/business/controller/BizProductionPlanDetailSubDetailController.java

@@ -115,12 +115,16 @@ public class BizProductionPlanDetailSubDetailController extends BaseController {
     @Log(title = "特殊报工查询工段", businessType = BusinessType.SELECT)
     @GetMapping("/specialGetDeptList")
     public AjaxResult specialGetDeptList() throws NoSuchFieldException, IllegalAccessException {
+        Long tenantId = Long.parseLong(request.getHeader("tenantId"));
         Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
         List<Long> ids = new ArrayList<>();
         //先查询登陆人员的部门信息
         QueryWrapper<SysDeptUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id", userId);
         queryWrapper.eq("deleted", 0);
+        if(tenantId!= 0){
+            queryWrapper.eq("tenant_id", tenantId);
+        }
         List<SysDeptUser> deptUserList = deptUserService.list(queryWrapper);
         if (deptUserList.size() > 0) {
             for (SysDeptUser item : deptUserList) {

src/main/resources/mybatis/business/BizReturnReceiptDetailMapper.xml

@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND id = #{outsource_detail_id}
     </select>
     <select id="getTurnoverDeptList" resultType="cn.ezhizao.project.system.domain.SysDept">
-        SELECT DISTINCT dp.dept_id as value, d.dept_name as label,d.is_sort_packaging
+        SELECT DISTINCT dp.dept_id as value, d.dept_name as label,d.is_sort_packaging,d.tenant_id
         FROM sys_dept d
         INNER JOIN biz_dept_process dp ON d.dept_id = dp.dept_id
         INNER JOIN
@@ -49,9 +49,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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} and btpd.tenant_id !=9  and btpd.process_step_number > #{processStepNumber}) AS m ON m.process_id = dp.process_id AND d.is_work_section = 1 or d.dept_code = '170000'
+        WHERE bppd.id = #{productionPlanDetailId} and btpd.tenant_id !=9  and btpd.process_step_number > #{processStepNumber}) AS m ON m.process_id = dp.process_id where( d.is_work_section = 1 or d.dept_code = '170000')
+        <if test="tenantId != null and tenantId != 0"> AND d.tenant_id = #{tenantId}</if>
         UNION
-        SELECT dept_id as value, dept_name as label,is_sort_packaging
+        SELECT dept_id as value, dept_name as label,is_sort_packaging,tenant_id
         FROM sys_dept
         WHERE dept_code = '170000'
         <if test="tenantId != null and tenantId != 0"> AND tenant_id = #{tenantId}</if>