修复 bug

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -132,8 +132,11 @@ public class SocialServiceImpl implements SocialServiceI {
      */
     @Override
     public List<TpAnnouncement> getAnnouncement(Integer communityId) {
-        Integer Num=tpCarouselSettingMapper.getcarouselNum(Constant.ANNOUNCEMENT, communityId);
-        List<TpAnnouncement> listAnnouncement=tpAnnouncementMapper.getAnnouncement(communityId,Num);
+        Integer num=tpCarouselSettingMapper.getcarouselNum(Constant.ANNOUNCEMENT, communityId);
+        if (null == num) {
+            num = 0;
+        }
+        List<TpAnnouncement> listAnnouncement=tpAnnouncementMapper.getAnnouncement(communityId,num);
         return listAnnouncement;
     }
 
@@ -614,8 +617,11 @@ public class SocialServiceImpl implements SocialServiceI {
 
     @Override
     public List<TpActivity> getActivity(Integer communityId) {
-        Integer Num=tpCarouselSettingMapper.getcarouselNum(Constant.ACTIVITY, communityId);
-        List<TpActivity> listActivity=tpActivityMapper.getActivity(communityId,Num);
+        Integer num = tpCarouselSettingMapper.getcarouselNum(Constant.ACTIVITY, communityId);
+        if (null == num) {
+            num = 0;
+        }
+        List<TpActivity> listActivity=tpActivityMapper.getActivity(communityId,num);
         return listActivity;
     }
     

CODE/smart-community/app-api/src/main/resources/mapper/TpCarouselSettingMapper.xml

@@ -85,7 +85,7 @@
       carousel_num = #{carouselNum,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <select id="getcarouselNum"  parameterType="java.lang.String" resultType="java.lang.Integer">
+  <select id="getcarouselNum"  resultType="java.lang.Integer">
     select carousel_num
     from
     tp_carousel_setting