From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java b/server/services/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java
index ce54721..53a5c43 100644
--- a/server/services/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java
@@ -5,6 +5,8 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.dao.business.web.response.MiniProgrammeDTO;
+import com.doumee.dao.system.SystemDictMapper;
+import com.doumee.dao.system.model.SystemDict;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
@@ -39,6 +41,8 @@
@Autowired
private SystemDictDataMapper systemDictDataMapper;
+ @Autowired
+ private SystemDictMapper systemDictMapper;
@Override
public String create(SystemDictData systemDictData) {
@@ -85,7 +89,7 @@
@Override
public SystemDictData findOne(SystemDictData systemDictData) {
- Wrapper<SystemDictData> wrapper = new QueryWrapper<>(systemDictData);
+ Wrapper<SystemDictData> wrapper = new QueryWrapper<>(systemDictData).last(" limit 1");
return systemDictDataMapper.selectOne(wrapper );
}
@@ -110,7 +114,6 @@
@Override
public MiniProgrammeDTO getMiniProgrammeDTO() {
try {
-
String jasonStr = MiniProgrammeDTO.toUnderlineJSONString(new MiniProgrammeDTO());
JSONObject parse = (JSONObject) JSONObject.parse(jasonStr);
List<String> collect = parse.entrySet().stream().map(s -> s.getKey().toUpperCase()).collect(Collectors.toList());
@@ -139,13 +142,13 @@
String jasonStr = MiniProgrammeDTO.toUnderlineJSONString(miniProgrammeDTO);
JSONObject parse = (JSONObject) JSONObject.parse(jasonStr);
parse.entrySet().forEach(s->{
- if (StringUtils.isEmpty((String)s.getValue())){
+// if (StringUtils.isNotBlank((String)s.getValue())){
UpdateWrapper<SystemDictData> wrapper = new UpdateWrapper<>();
wrapper.lambda()
.eq(SystemDictData::getLabel,s.getKey().toUpperCase())
.set(SystemDictData::getCode,s.getValue());
systemDictDataMapper.update(null,wrapper);
- }
+// }
});
} catch (JsonProcessingException e) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀛楀吀鍊艰В鏋愭湁璇�");
--
Gitblit v1.9.3