From 98e06673cc0858aebed99c4e9550d2d71d838e6f Mon Sep 17 00:00:00 2001
From: chenye <chenye0811@qq.com>
Date: 星期一, 10 七月 2023 09:03:47 +0800
Subject: [PATCH] 空值判断
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/staff/StaffController.java | 9 +++++++--
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/staff/StaffController.java | 2 +-
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 10 +++++-----
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/staff/StaffController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/staff/StaffController.java
index 28afd9f..1efc46b 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/staff/StaffController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/staff/StaffController.java
@@ -37,7 +37,7 @@
* @return
*/
@RequestMapping(value = "/getStaffHomeTotal", method = RequestMethod.POST)
- @ApiOperation(value = "获取员工端商铺统计")
+ @ApiOperation(value = "获取员工端商铺统计(首页)")
public R<MerHomeShopTotalVo> getStaffHomeTotal() {
Long userId = SecurityUtils.getUserId();
MerHomeShopTotalVo merHomeShopTotalVo = shopService.getStaffHomeTotal(userId);
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index c504bbb..1a0a4f2 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -678,12 +678,12 @@
MerHomeShopTotalVo merHomeShopTotalVo = new MerHomeShopTotalVo();
merHomeShopTotalVo.setShopIds(shopIds);
MerHomeShopTotalVo orderVo = remoteOrderService.getMerHomeTotal(merHomeShopTotalVo).getData();
- merHomeShopTotalVo.setTodayShop(orderVo.getTodayShop());
- merHomeShopTotalVo.setUnHandleOrder(orderVo.getUnHandleOrder());
- merHomeShopTotalVo.setShopTurnover(orderVo.getShopTurnover());
+ merHomeShopTotalVo.setTodayShop(null!=orderVo?orderVo.getTodayShop():0);
+ merHomeShopTotalVo.setUnHandleOrder(null!=orderVo?orderVo.getUnHandleOrder():0);
+ merHomeShopTotalVo.setShopTurnover(null!=orderVo?orderVo.getShopTurnover():BigDecimal.ZERO);
ShopTotal shopTotal = shopTotalService.shopsTotalByIds(shopIds);
- merHomeShopTotalVo.setCycleSurp(shopTotal.getUseableCyclePerson());
- merHomeShopTotalVo.setExplorationSurp(shopTotal.getUseableExperiencePerson());
+ merHomeShopTotalVo.setCycleSurp(null!=shopTotal?shopTotal.getUseableCyclePerson():0);
+ merHomeShopTotalVo.setExplorationSurp(null!=shopTotal?shopTotal.getUseableExperiencePerson():0);
Integer taskCount = memberTaskService.getMembersIngTotal(shopIds);
merHomeShopTotalVo.setTask(taskCount);
return merHomeShopTotalVo;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/staff/StaffController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/staff/StaffController.java
index bec536f..9a5aaec 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/staff/StaffController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/staff/StaffController.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.controller.staff;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.domain.pojo.staff.SysStaff;
import com.ruoyi.system.service.staff.SysStaffService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -22,8 +23,12 @@
@RequestMapping(value = "/isLeader", method = RequestMethod.POST)
@ApiOperation(value = "获取员工信息")
- public boolean isLeader() {
+ public Boolean isLeader() {
Long userId = SecurityUtils.getUserId();
- return sysStaffService.getByUserId(userId).getHeadFlag().equals("1") ? true : false;
+ SysStaff sysStaff = sysStaffService.getByUserId(userId);
+ if(null!=sysStaff){
+ return sysStaffService.getByUserId(userId).getHeadFlag().equals("1") ? true : false;
+ }
+ return false;
}
}
--
Gitblit v1.7.1