|
@@ -9,16 +9,17 @@ package org.eco.vip.nexus.core.service.config;
|
|
|
import com.mybatisflex.core.paginate.Page;
|
|
|
import com.mybatisflex.core.query.QueryWrapper;
|
|
|
import jakarta.annotation.Resource;
|
|
|
+import org.eco.vip.core.pojo.PageResult;
|
|
|
+import org.eco.vip.core.utils.CollUtils;
|
|
|
+import org.eco.vip.core.utils.MapstructUtils;
|
|
|
import org.eco.vip.core.utils.ObjUtils;
|
|
|
+import org.eco.vip.core.utils.StrUtils;
|
|
|
import org.eco.vip.nexus.core.domain.config.Config;
|
|
|
import org.eco.vip.nexus.core.domain.config.pojo.ConfigBO;
|
|
|
import org.eco.vip.nexus.core.domain.config.pojo.ConfigVO;
|
|
|
import org.eco.vip.nexus.core.mapper.ConfigMapper;
|
|
|
import org.eco.vip.orm.domain.PageQuery;
|
|
|
-import org.eco.vip.core.pojo.PageResult;
|
|
|
import org.eco.vip.orm.service.BaseService;
|
|
|
-import org.eco.vip.core.utils.CollUtils;
|
|
|
-import org.eco.vip.core.utils.MapstructUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.List;
|
|
@@ -78,7 +79,7 @@ public class ConfigService extends BaseService<ConfigMapper, Config> implements
|
|
|
|
|
|
@Override
|
|
|
public ConfigVO selectById(String id) {
|
|
|
- QueryWrapper queryWrapper = query().where(CONFIG.CONFIG_ID.eq(id));
|
|
|
+ QueryWrapper queryWrapper = query().where(CONFIG.CONFIG_ID.eq(id).when(StrUtils.isNotBlank(id))).and(CONFIG.CONFIG_ID.isNull().when(StrUtils.isBlank(id)));
|
|
|
return this.getOneAs(queryWrapper, ConfigVO.class);
|
|
|
}
|
|
|
|
|
@@ -93,7 +94,7 @@ public class ConfigService extends BaseService<ConfigMapper, Config> implements
|
|
|
public String getConfValue(String key) {
|
|
|
QueryWrapper queryWrapper = query().where(CONFIG.CONFIG_KEY.eq(key));
|
|
|
Config config = this.getOne(queryWrapper);
|
|
|
- if(ObjUtils.isNotEmpty(config)){
|
|
|
+ if (ObjUtils.isNotEmpty(config)) {
|
|
|
return config.getConfigValue();
|
|
|
}
|
|
|
return "";
|