模块开发1

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

@@ -70,8 +70,12 @@ 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")
-                .eq(StringUtils.isNotBlank(orgId),"org_id",orgId);
+        baseFilterInfoQueryWrapper.eq("user_id", loginUser.getId()).eq("module_type", "produce");
+        if ("".equals(orgId) || null == orgId) {
+            baseFilterInfoQueryWrapper.eq("org_id", "0");
+        } else {
+            baseFilterInfoQueryWrapper.eq("org_id",orgId);
+        }
         SysBaseFilterInfo sysBaseFilterInfo = baseFilterInfoMapper.selectOne(baseFilterInfoQueryWrapper);
         String type = "";
         if (ObjectUtil.isEmpty(sysBaseFilterInfo)) {