模块开发12

huimv-farm/src/main/java/vip/xiaonuo/erp/entity/SysBaseFilterInfo.java

@@ -46,4 +46,7 @@ public class SysBaseFilterInfo {
     /** FILTER */
     @ApiModelProperty(value = "FILTER", position = 4)
     private String filter;
+
+    @ApiModelProperty(value = "orgId", position = 5)
+    private String orgId;
 }

huimv-farm/src/main/java/vip/xiaonuo/production/param/ProductionSaveParam.java

@@ -30,5 +30,7 @@ public class ProductionSaveParam {
     @ApiModelProperty(value = "填报实际产量 0 erp数据  1填报数据", required = true)
     private Integer isErp;
 
+    @ApiModelProperty(value = "orgId", required = true)
+    private String orgId;
 
 }

huimv-farm/src/main/java/vip/xiaonuo/production/param/ProductionWriteListParam.java

@@ -26,4 +26,6 @@ import lombok.Setter;
 @Setter
 public class ProductionWriteListParam {
 
+    @ApiModelProperty(value = "orgId", required = true)
+    private String orgId;
 }

huimv-farm/src/main/java/vip/xiaonuo/production/service/impl/ProductionTargetServiceImpl.java

@@ -70,13 +70,15 @@ public class ProductionTargetServiceImpl extends ServiceImpl<ProductionTargetMap
         ProductionTarget productionTarget = new ProductionTarget();
         SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
         QueryWrapper<SysBaseFilterInfo> baseFilterInfoQueryWrapper = new QueryWrapper<>();
-        baseFilterInfoQueryWrapper.eq("user_id", loginUser.getId()).eq("module_type", "produce");
+        baseFilterInfoQueryWrapper.eq("user_id", loginUser.getId()).eq("module_type", "produce")
+                .eq(StringUtils.isNotBlank(orgId),"org_id",orgId);
         SysBaseFilterInfo sysBaseFilterInfo = baseFilterInfoMapper.selectOne(baseFilterInfoQueryWrapper);
         String type = "";
         if (ObjectUtil.isEmpty(sysBaseFilterInfo)) {
             sysBaseFilterInfo.setFilter("0");
             sysBaseFilterInfo.setUserId(loginUser.getId());
             sysBaseFilterInfo.setModuleType("produce");
+            sysBaseFilterInfo.setOrgId("0");
             baseFilterInfoMapper.insert(sysBaseFilterInfo);
             type = "0";
         } else {

huimv-farm/src/main/java/vip/xiaonuo/production/service/impl/ProductionWritePlanServiceImpl.java

@@ -90,15 +90,22 @@ public class ProductionWritePlanServiceImpl extends ServiceImpl<ProductionWriteP
     @Override
     public CommonResult save(ProductionSaveParam saveParam) {
         Integer isErp = saveParam.getIsErp();
+        String orgId = saveParam.getOrgId();
         SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
         QueryWrapper<SysBaseFilterInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id", loginUser.getId()).eq("module_type", "produce");
+        if ("".equals(orgId) || null == orgId) {
+            queryWrapper.eq("org_id", "0");
+        } else {
+            queryWrapper.eq("org_id",orgId);
+        }
         SysBaseFilterInfo sysBaseFilterInfo = filterInfoMapper.selectOne(queryWrapper);
         if (ObjectUtil.isEmpty(sysBaseFilterInfo)) {
             SysBaseFilterInfo info = new SysBaseFilterInfo();
             info.setModuleType("produce");
             info.setUserId(loginUser.getId());
             info.setModuleType(isErp.toString());
+            info.setOrgId("0");
             filterInfoMapper.insert(info);
         } else {
             sysBaseFilterInfo.setFilter(isErp.toString());
@@ -109,9 +116,15 @@ public class ProductionWritePlanServiceImpl extends ServiceImpl<ProductionWriteP
 
     @Override
     public SysBaseFilterInfo getOne(ProductionWriteListParam writeListParam) {
+        String orgId = writeListParam.getOrgId();
         SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
         QueryWrapper<SysBaseFilterInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id", loginUser.getId()).eq("module_type", "produce");
+        if ("".equals(orgId) || null == orgId) {
+            queryWrapper.eq("org_id", "0");
+        } else {
+            queryWrapper.eq("org_id", orgId);
+        }
         return filterInfoMapper.selectOne(queryWrapper);
     }