|
@@ -1,5 +1,6 @@
|
|
package org.jeecg.common.aspect;
|
|
package org.jeecg.common.aspect;
|
|
|
|
|
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
@@ -18,6 +19,7 @@ import org.jeecg.common.system.service.ICoreService;
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
|
|
+import org.springframework.util.ObjectUtils;
|
|
import org.springframework.util.StringUtils;
|
|
import org.springframework.util.StringUtils;
|
|
|
|
|
|
import java.lang.reflect.Field;
|
|
import java.lang.reflect.Field;
|
|
@@ -134,6 +136,9 @@ public class DictAspect {
|
|
/* if (((Result) result).getResult() instanceof List) {
|
|
/* if (((Result) result).getResult() instanceof List) {
|
|
return;
|
|
return;
|
|
}*/
|
|
}*/
|
|
|
|
+ if (ObjectUtil.isEmpty(((Result) result).getResult())) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
List<JSONObject> items = new ArrayList<>();
|
|
List<JSONObject> items = new ArrayList<>();
|
|
for (Object record : ((Result<PageInfo>) result).getResult().getList()){
|
|
for (Object record : ((Result<PageInfo>) result).getResult().getList()){
|
|
ObjectMapper mapper = new ObjectMapper();
|
|
ObjectMapper mapper = new ObjectMapper();
|