LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 变更DictAspect.java导致的问题

Browse Source
This commit is contained in:
lijiarao
2024-03-20 16:28:56 +08:00
parent 40e69dca1b
commit b6b8384bc7
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java
+8 -8
View File
@@ -106,13 +106,6 @@ public class DictAspect {
items.add(item);
}
((IPage) ((Result) result).getResult()).setRecords(items);
}else if (((Result) result).getResult() instanceof List){
List<JSONObject> items = new ArrayList<>();
for (Object record :(List) ((Result) result).getResult()) {
JSONObject item = translate(record);
items.add(item);
}
((Result) result).setResult(items);
}else {
Object record = (Object) ((Result) result).getResult();
ObjectMapper mapper = new ObjectMapper();
@@ -161,7 +154,14 @@ public class DictAspect {
* @param result
*/
private void parseMethodDictText(Object result) {
if (result instanceof Result) {
if (((Result) result).getResult() instanceof List){
List<JSONObject> items = new ArrayList<>();
for (Object record :(List) ((Result) result).getResult()) {
JSONObject item = translate(record);
items.add(item);
}
((Result) result).setResult(items);
} else if (result instanceof Result) {
Object result1 = ((Result<Object>) result).getResult();
String jsonStr = JSONUtil.toJsonStr(result1);
if (JSONUtil.isJsonObj(jsonStr)) {
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/MemberStatisticsController.java
+3
View File
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.Dict;
import com.jero.common.aspect.annotation.DictPoint;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.PasswordUtil;
import com.jero.member.entity.TbMemberProjectSubitem;
@@ -39,6 +41,7 @@ public class MemberStatisticsController {
return Result.OK(lineChartVO);
}
@DictPoint
@ApiOperation(value = "饼图")
@GetMapping(value = "/pieChart")
public Result<List<MemberPieChartVO>> pieChart() {