|
|
@@ -5,10 +5,12 @@ import jp.yamoto.farm.common.annotation.DataSource;
|
|
|
import jp.yamoto.farm.common.biz.domain.entity.SysConfig;
|
|
|
import jp.yamoto.farm.common.biz.mapper.SysConfigMapper;
|
|
|
import jp.yamoto.farm.common.biz.service.ISysConfigService;
|
|
|
+import jp.yamoto.farm.common.biz.service.ISysDictDataService;
|
|
|
import jp.yamoto.farm.common.cache.AppCache;
|
|
|
import jp.yamoto.farm.common.constant.CacheConstants;
|
|
|
import jp.yamoto.farm.common.constant.UserConstants;
|
|
|
import jp.yamoto.farm.common.enums.DataSourceType;
|
|
|
+import jp.yamoto.farm.common.enums.SysDictTypeEnum;
|
|
|
import jp.yamoto.farm.common.exception.ServiceException;
|
|
|
import jp.yamoto.farm.common.text.Convert;
|
|
|
import jp.yamoto.farm.common.utils.MessageUtils;
|
|
|
@@ -32,6 +34,9 @@ public class SysConfigServiceImpl implements ISysConfigService
|
|
|
private SysConfigMapper configMapper;
|
|
|
|
|
|
@Autowired
|
|
|
+ private ISysDictDataService sysDictDataService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
private AppCache appCache;
|
|
|
|
|
|
/**
|
|
|
@@ -108,7 +113,13 @@ public class SysConfigServiceImpl implements ISysConfigService
|
|
|
@Override
|
|
|
public List<SysConfig> selectConfigList(SysConfig config)
|
|
|
{
|
|
|
- return configMapper.selectConfigList(config);
|
|
|
+ List<SysConfig> sysConfigList = configMapper.selectConfigList(config);
|
|
|
+ if(ValueUtils.isNotEmpty(sysConfigList)){
|
|
|
+ for(SysConfig sysConfig : sysConfigList){
|
|
|
+ sysConfig.setConfigTypeLabel(sysDictDataService.selectDictLabel(SysDictTypeEnum.SYS_YES_NO.getCode(), sysConfig.getConfigType()));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return sysConfigList;
|
|
|
}
|
|
|
|
|
|
/**
|