From 64f45c75ea93911b9841bf00bb4c436cd294be3a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 15 九月 2023 18:30:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/service/business/impl/WebParamServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/WebParamServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/WebParamServiceImpl.java
index e3f920e..2d9043e 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/WebParamServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/WebParamServiceImpl.java
@@ -1,8 +1,10 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.WebParamMapper;
import com.doumee.dao.business.model.WebParam;
@@ -33,13 +35,21 @@
@Autowired
private WebParamMapper webParamMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
@Override
public WebParam findOne() {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
QueryWrapper<WebParam> wrapper = new QueryWrapper<>();
wrapper.eq("COMPANY_ID",user.getCompanyId());
wrapper.last(" limit 1 ");
- return webParamMapper.selectOne(wrapper);
+ WebParam webParam = webParamMapper.selectOne(wrapper);
+ if(!Objects.isNull(webParam)){
+ webParam.setResourcePath(systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.WEB_PARAM).getCode());
+ }
+ return webParam;
}
@@ -54,6 +64,7 @@
webParam = new WebParam();
BeanUtils.copyProperties(updateWebParamDTO,webParam);
webParam.setCreateTime(new Date());
+ webParam.setDeleted(Constants.ZERO);
webParam.setCompanyId(user.getCompanyId());
webParam.setCreateUser(user.getId());
webParamMapper.insert(webParam);
--
Gitblit v1.9.3