0428

src/main/java/cn/ezhizao/project/business/resourceGroup/controller/BizProductionResourceGroupDetailController.java

@@ -91,12 +91,15 @@ public class BizProductionResourceGroupDetailController extends BaseController {
             groupIds.add(item.getResourceGroupId());
         }
         //查出当前人员所在的资源组
-        List<BizProductionResourceGroupDetail> userGroupList = bizProductionResourceGroupDetailService.query().in("production_resource_group_id", groupIds).eq("common_id", user.getUserId()).eq("common_type","person").list();
+        List<BizProductionResourceGroupDetail> userGroupList = bizProductionResourceGroupDetailService.query()
+                .eq("dept_id",deptId)
+                .in("production_resource_group_id", groupIds).eq("common_id", user.getUserId()).eq("common_type","person").list();
         for (BizProductionResourceGroupDetail userItem : userGroupList
         ) {
             equipmentIds.add(userItem.getProductionResourceGroupId());
         }
-        List<BizProductionResourceGroupDetail> list = bizProductionResourceGroupDetailService.query().in("production_resource_group_id", equipmentIds).eq("common_type", "equipmentDetail").inSql("common_id", "SELECT id FROM biz_equipment_detail WHERE equipment_status_code = 'NA'").eq("deleted",0).list();
+        List<BizProductionResourceGroupDetail> list = bizProductionResourceGroupDetailService.query().eq("dept_id",deptId)
+                .in("production_resource_group_id", equipmentIds).eq("common_type", "equipmentDetail").inSql("common_id", "SELECT id FROM biz_equipment_detail WHERE equipment_status_code = 'NA'").eq("deleted",0).list();
 
         BizUserEquipmentGroup groupDetails = new BizUserEquipmentGroup();
         groupDetails.setUserId(user.getUserId());