From 2e50e8566bb05279a5a9cb27119a38ef6827a2cc Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Mar 2022 18:14:42 +0800
Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' of http://120.27.238.55:7000/r/beauty-erp into feature/订单服务单代码改造
---
zq-erp/src/main/java/com/matrix/system/common/actions/BusParameterSettingsAction.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/BusParameterSettingsAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/BusParameterSettingsAction.java
index 485c148..5497a69 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/BusParameterSettingsAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/BusParameterSettingsAction.java
@@ -7,10 +7,10 @@
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.dao.BusParameterSettingsDao;
+import com.matrix.system.enums.BooleanEnum;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.ParameterSettings;
import com.matrix.system.hive.dao.ParameterSettingsDao;
-import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@@ -124,7 +124,13 @@
BusParameterSettings newParam=new BusParameterSettings();
newParam.setParamCode(parameterSetting.getCode());
newParam.setCompanyId(user.getCompanyId());
- newParam.setParamValue(parameterSetting.getUserValue());
+ if(BooleanEnum.TRUE.getDisplayName().equals(parameterSetting.getUserValue())){
+ newParam.setParamValue(String.valueOf(BooleanEnum.TRUE.getValue()));
+ }else if(BooleanEnum.FALSE.getDisplayName().equals(parameterSetting.getUserValue())){
+ newParam.setParamValue(String.valueOf(BooleanEnum.FALSE.getValue()));
+ }else{
+ newParam.setParamValue(parameterSetting.getUserValue());
+ }
if(type==SHOP){
newParam.setShopId(user.getShopId());
}
--
Gitblit v1.9.1