fangzhen 2 сар өмнө
parent
commit
6d27c1fb00

+ 1 - 1
ruoyi-admin/src/main/resources/application-druid.yml

@@ -9,7 +9,7 @@ spring:
                 url: jdbc:mysql://121.4.140.159:3307/ruoyi-community?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: fangzhen,7410
-                #url: jdbc:mysql://rm-bp12v02802jkd05j89o.mysql.rds.aliyuncs.com:3306/ruoyi-community?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                #url: jdbc:mysql://rm-bp12v02802jkd05j89o.mysql.rds.aliyuncs.com:3306/ruoyi-community_backup?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 #username: cysd
                 #password: cysd123!@#
             # 从库数据源

+ 1 - 1
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/CommunityArticleController.java

@@ -283,7 +283,7 @@ public class CommunityArticleController extends BaseController {
             Long userId = SecurityUtils.getLoginUser().getUserId();
             String classId = communityArticleService.selectCommunityUserInfoById(userId, true).getClassId();
 
-            if (classId.length() != 0 ){
+            if (classId != null && !classId.isEmpty()){
                 List<Long> sortOrder = Arrays.stream(classId.split(","))
                         .map(String::trim)
                         .map(Long::parseLong)

+ 2 - 2
ruoyi-generator/src/main/resources/mapper/community/CommunityCollectionMapper.xml

@@ -89,8 +89,8 @@
 
     <select id="selectCollectById" resultType="com.ruoyi.generator.vo.CommunityCollectionVo">
         select a.id,a.collection_name,a.collection_profile,a.images,a.collection_tag
-        from `ruoyi-community`.community_collection a
-                 left join `ruoyi-community`.community_collection_article b on a.id = b.collection_id
+        from community_collection a
+                 left join community_collection_article b on a.id = b.collection_id
         where b.article_id = #{articleId} and (b.is_delete is null or b.is_delete != '1')
     </select>
 </mapper>