From 77c688fd5ff2ad1b9705dec74653491ba629663a Mon Sep 17 00:00:00 2001
From: bonus <1203338439@qq.com>
Date: Thu, 13 Feb 2025 17:12:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97bug=E4=BF=AE=E6=94=B9=E5=8F=8A=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=9C=AA=E8=AF=BB=E6=95=B0=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LargeScreenController.java           |  5 ++++-
 .../material/user/controller/UserController.java    |  2 +-
 .../com/bonus/material/user/entity/UserDto.java     |  3 +++
 .../mapper/material/lease/MaLeaseInfoMapper.xml     |  4 +++-
 .../resources/mapper/material/user/UserMapper.xml   | 13 +++++++++++--
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java
index 2dfcd12..47415b4 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java
@@ -113,7 +113,10 @@ public class LargeScreenController {
         Integer repairingDevNum = devInfoMapper.getRepairingDevNum();
         orderData.setDevRepairingNum(repairingDevNum);
         DevInfo devInfo = devInfoMapper.getDevUsageRatio();
-        orderData.setDevUsageRatio(MathUtil.calculatePercentage(devInfo.getTotalLeaseDay(), devInfo.getTotalUpDay() + devInfo.getTotalLeaseDay()));
+        if(devInfo != null){
+            orderData.setDevUsageRatio(MathUtil.calculatePercentage(devInfo.getTotalLeaseDay(), devInfo.getTotalUpDay() + devInfo.getTotalLeaseDay()));
+        }
+
         return AjaxResult.success(orderData);
     }
 
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/user/controller/UserController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/user/controller/UserController.java
index 42a37d5..8ca01d3 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/user/controller/UserController.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/user/controller/UserController.java
@@ -18,7 +18,7 @@ import java.util.List;
  */
 @RestController
 @Api(value = "个人管理", tags = {"个人管理"})
-@RequestMapping("/userManage")
+@RequestMapping("/")
 public class UserController extends BaseController {
 
     @Resource
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/user/entity/UserDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/user/entity/UserDto.java
index abddd4a..5faa59a 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/user/entity/UserDto.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/user/entity/UserDto.java
@@ -87,4 +87,7 @@ public class UserDto {
 
     @ApiModelProperty(value = "是否内置用户0：内置用户，1：非内置用户")
     private String isBuiltIn;
+
+    @ApiModelProperty(value = "消息数")
+    private String msgNum;
 }
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml
index 6bc7a04..e74ac13 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml
@@ -448,6 +448,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT distinct(type_id)
         FROM ma_lease_details
         where type_id is not null
+        group by type_id
+        limit 1
     </select>
 
     <select id="getTopPopularTypeName" resultType="java.lang.String">
@@ -507,4 +509,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY
             lease_count DESC
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/user/UserMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/user/UserMapper.xml
index 0fbc8e4..8fe8107 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/user/UserMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/user/UserMapper.xml
@@ -13,6 +13,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <select id="getUserById" resultType="com.bonus.material.user.entity.UserDto">
-        select * from sys_user where user_id = #{userId}
+        SELECT
+            su.*,
+            SUM(
+                    IF
+                        ( is_read = 0, 1, 0 )) AS msgNum
+        FROM
+            sys_user su
+                LEFT JOIN bm_message bm ON su.user_id = bm.to_user
+        WHERE
+            su.user_id =#{userId}
     </select>
-</mapper>
\ No newline at end of file
+</mapper>