浏览代码

refactor(system): 修改默认首页资源名称

- 将 FACILITY_INFO 常量的值从 "facility_info" 修改为 "facilities_service"
- 这个修改可能与系统首页的设施服务相关功能有关
SheepHy 3 周之前
父节点
当前提交
6761862eb6

+ 6 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/AppHomeServiceImpl.java

@@ -113,8 +113,12 @@ public class AppHomeServiceImpl implements IAppHomeService {
                         .setAvatar(sysUser.getAvatar())
                         .setName(sysUser.getRealname()).setList(list)
                         .setTeachingCount(appInstructor.getClassesNumber())
-                        .setOrgName(appSite.getName())
-                        .setOrderCount(appOrderMapper.findByOrderNumCount(courseIds));
+                        .setOrgName(appSite.getName());
+                if(!courseIds.isEmpty()){
+                    instructorVO.setOrderCount(appOrderMapper.findByOrderNumCount(courseIds));
+                }else {
+                    instructorVO.setOrderCount(0L);
+                }
             }
 
             // 获取该教练的课程(最多取2个)

+ 12 - 5
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppOrderMapper.xml

@@ -64,11 +64,18 @@
         </foreach>
     </select>
     <select id="findByOrderNumCount" resultType="java.lang.Long">
-        select count(DISTINCT  order_id)  from nm_order_pro_info
-        where type = 5 and product_id in
-        <foreach collection="productIds" item="productId" open="(" separator="," close=")">
-            #{productId}
-        </foreach>
+        SELECT COUNT(DISTINCT order_id)
+        FROM nm_order_pro_info
+        WHERE type = 5
+        <if test="productIds != null and !productIds.isEmpty()">
+            AND product_id IN
+            <foreach collection="productIds" item="productId" open="(" separator="," close=")">
+                #{productId}
+            </foreach>
+        </if>
+        <if test="productIds == null or productIds.isEmpty()">
+            AND 1 = 0
+        </if>
     </select>
     <select id="queryBookedCount" resultType="java.lang.Integer">
         SELECT