From 0fdac321828bffa833f7d0155a5c147d23bd78d8 Mon Sep 17 00:00:00 2001 From: futian.liu <liufutianyoo@163.com> Date: 星期五, 15 十二月 2023 12:26:25 +0800 Subject: [PATCH] 1.修改调拨查询物品分类接口 2.解决超级管理员无法登录 3.修改手机号 --- consum-base/src/main/java/com/consum/base/controller/LWhHomeStatisticsController.java | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhHomeStatisticsController.java b/consum-base/src/main/java/com/consum/base/controller/LWhHomeStatisticsController.java index fa93227..f178344 100644 --- a/consum-base/src/main/java/com/consum/base/controller/LWhHomeStatisticsController.java +++ b/consum-base/src/main/java/com/consum/base/controller/LWhHomeStatisticsController.java @@ -1,18 +1,22 @@ package com.consum.base.controller; -import cn.hutool.core.convert.Convert; -import com.consum.base.BaseController; -import com.consum.base.service.LWhGoodsService; -import com.consum.model.po.FinSysTenantUser; -import com.walker.web.ResponseValue; -import io.swagger.annotations.Api; +import java.util.List; +import java.util.Map; + +import javax.annotation.Resource; + import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; +import com.consum.base.BaseController; +import com.consum.base.service.LWhGoodsService; +import com.consum.model.po.FinSysTenantUser; +import com.walker.infrastructure.utils.CollectionUtils; +import com.walker.web.ResponseValue; + +import cn.hutool.core.convert.Convert; +import io.swagger.annotations.Api; /** * @ClassName LWhHomeStatisticsController @@ -39,7 +43,10 @@ /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/ FinSysTenantUser sysInfo = this.getSysInfo(); String tenantId = sysInfo.getTenantId(); - List<Map<String, Object>> goodsNumPrice = lWhGoodsService.getGoodsNumPrice(Convert.toLong(tenantId, 0l)); + List<Map<String, Object>> goodsNumPrice = lWhGoodsService.getGoodsNumPrice(Convert.toLong(tenantId, 0L)); + if (CollectionUtils.isEmpty(goodsNumPrice)){ + return ResponseValue.success(); + } return ResponseValue.success(goodsNumPrice.get(0)); } @@ -48,7 +55,7 @@ /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/ FinSysTenantUser sysInfo = this.getSysInfo(); String tenantId = sysInfo.getTenantId(); - List<Map<String, Object>> goodsNumPrice = lWhGoodsService.getGoodsNumByMonth(Convert.toLong(tenantId, 0l)); + List<Map<String, Object>> goodsNumPrice = lWhGoodsService.getGoodsNumByMonth(Convert.toLong(tenantId, 0L)); return ResponseValue.success(goodsNumPrice); } } -- Gitblit v1.9.1