Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/cn/ezhizao/framework/web/controller/BaseController.java

src/main/java/cn/ezhizao/framework/web/controller/BaseController.java

@@ -39,9 +39,9 @@ import java.util.stream.Collectors;
  */
 public class BaseController {
     protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+
     @Resource
     private HttpServletRequest request;
-
     /**
      * 将前台传递过来的日期格式的字符串，自动转化为Date类型
      */
@@ -236,6 +236,7 @@ public class BaseController {
             field.set(t, tenantId);
         }
     }
+
     protected Long getTenantId() {
         return request.getHeader("tenantId") != null && !Objects.equals(request.getHeader("tenantId"), "0") ? Long.parseLong(request.getHeader("tenantId")) : null;
     }

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

@@ -84,6 +84,8 @@ public class BizProductionResourceGroupController extends BaseController {
     @Transactional
     @PostMapping
     public AjaxResult add(@RequestBody BizProductionResourceGroup bizProductionResourceGroup) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizProductionResourceGroup);
+        Long tenantId = getTenantId();
         if (bizProductionResourceGroup.getId() == null) {
             List<BizProductionResourceGroup> groupList = bizProductionResourceGroupService.query().eq("dept_id", bizProductionResourceGroup.getDeptId()).eq("code", bizProductionResourceGroup.getCode()).list();
             if (groupList.size() > 0) {
@@ -101,6 +103,7 @@ public class BizProductionResourceGroupController extends BaseController {
         bizProductionResourceGroup.getGroupDetailList().stream().forEach(item -> {
             item.setDeptId(bizProductionResourceGroup.getDeptId());
             item.setProductionResourceGroupId(bizProductionResourceGroup.getId());
+            item.setTenantId(tenantId);
         });
         //查询非当前资源组下是否该设备已经被绑定了
         List<Long> equipmentListIds = bizProductionResourceGroupDetailService.query().ne("production_resource_group_id", bizProductionResourceGroup.getId()).eq("common_type", "equipmentDetail").eq("deleted", 0).list().stream().map(BizProductionResourceGroupDetail::getCommonId).collect(Collectors.toList());