添加空值判断

pz-admin/src/main/java/com/pz/web/controller/system/SysLoginController.java

@@ -26,6 +26,7 @@ import javax.validation.constraints.NotBlank;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * 登录验证
@@ -110,7 +111,10 @@ public class SysLoginController {
     public R<Map<String, Object>> getInfo() {
         LoginUser loginUser = LoginHelper.getLoginUser();
         SysUser user = userService.selectUserById(loginUser.getUserId());
-        user.setRoleId(iSysRoleService.getRoleByUserId(user.getUserId()).getRoleId());
+        Optional.ofNullable(iSysRoleService.getRoleByUserId(user.getUserId()))
+            .ifPresent(sysRole -> {
+                user.setRoleId(sysRole.getRoleId());
+            });
         Map<String, Object> ajax = new HashMap<>();
         ajax.put("user", user);
         ajax.put("roles", loginUser.getRolePermission());

pz-system/src/main/resources/mapper/system/TotalOrderMapper.xml

@@ -71,7 +71,7 @@
         where t.id = #{id}
     </select>
     <select id="selectSaleroom" resultType="com.pz.system.domain.vo.DataOrderVo">
-        SELECT IFNULL(ROUND(SUM(pay_money), 2),0) as dataSum FROM total_order WHERE `status` = 1 and refund_amount = 0
+        SELECT IFNULL(ROUND(SUM(pay_money), 2),0) as dataSum FROM total_order WHERE `status` != 0 and refund_amount = 0
         <if test="dataViewBo.condition == 2">
             and finish_time >= DATE_SUB(CURDATE(), INTERVAL 7 DAY) -- 近7天
         </if>