From 62ff723e4ffaecfe11c91145a5aa944c58a1677c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 30 Mar 2022 10:57:23 +0800
Subject: [PATCH] 新增会员,需要从当前操作人员获取公司ID

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
index ef4002c..47a9745 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
@@ -1027,7 +1027,7 @@
         if (CollectionUtils.isNotEmpty(projServicesVo.getOutStoreItem())) {
             BusParameterSettings manageStockSetting = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WAREHOUSE_MANAGE_STOCK, projServicesVo.getCompanyId());
 //            if (AppConstance.IS_Y.equals(manageStockSetting.getParamValue())) {
-            if (BooleanEnum.TRUE.getValue().equals(manageStockSetting.getParamValue())) {
+            if (BooleanEnum.TRUE.getValue() == manageStockSetting.getIntParamValue()) {
                 for (SysOutStoreItem item : projServicesVo.getOutStoreItem()) {
                     if (item.getAmount() != null && item.getAmount() > 0) {
                         return true;
@@ -1170,7 +1170,7 @@
 //                    flag = true;
 //                    break;
 //                }
-                if (step.equals(setting.getCode()) && BooleanEnum.TRUE.getValue().equals(setting.getUserValue())) {
+                if (step.equals(setting.getCode()) && BooleanEnum.TRUE.getValue() == Integer.parseInt(setting.getUserValue())) {
                     flag = true;
                     break;
                 }

--
Gitblit v1.9.1