bug fixed

src/main/java/cn/wisenergy/chnmuseum/party/mapper/LearningContentBoardMapper.java

@@ -31,13 +31,28 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
     )
     IPage<ExhibitionBoard> selectBoardPageByLearningContentId(Page<?> page, String learningContentId, String nameOrCode);
 
-    @Select("<script>" + "SELECT a.* FROM learning_content_board lcb, learning_content lc, exhibition_board eb, asset a "
+    @Select("<script>"
+            + "SELECT a.* FROM learning_content_board lcb, learning_content lc, exhibition_board eb, asset a "
             + "WHERE lcb.learning_content_id = lc.id "
             + "and lcb.exhibition_board_id = eb.id "
             + "and eb.asset_id = a.id "
-            + "and lc.organ_id = #{organId}"
+            + "and lc.applicable_scope = 'THIS_ORGAN' "
+            + "and lc.organ_code = #{organCode} "
+            + "UNION "
+            + "SELECT a.* FROM learning_content_board lcb, learning_content lc, exhibition_board eb, asset a "
+            + "WHERE lcb.learning_content_id = lc.id "
+            + "and lcb.exhibition_board_id = eb.id "
+            + "and eb.asset_id = a.id "
+            + "and lc.applicable_scope = 'THIS_ORGAN_SUB'"
+            + "and lc.organ_code like CONCAT(#{organCode},'%') "
+            + "UNION "
+            + "SELECT a.* FROM learning_content_board lcb, learning_content lc, exhibition_board eb, asset a "
+            + "WHERE lcb.learning_content_id = lc.id "
+            + "and lcb.exhibition_board_id = eb.id "
+            + "and eb.asset_id = a.id "
+            + "and lc.applicable_scope = 'ALL_PLAT'"
             + "</script>"
     )
-    IPage<Asset> selectAssetPageByOrganId(Page<?> page, String organId);
+    IPage<Asset> selectAssetPageByOrganCode(Page<?> page, String organCode);
 
 }

src/main/java/cn/wisenergy/chnmuseum/party/model/LearningContent.java

@@ -54,9 +54,9 @@ public class LearningContent implements Serializable {
     @NotBlank(message = "适用范围不能为空", groups = {Add.class, Update.class})
     private String applicableScope;
 
-    @ApiModelProperty(value = "机构ID")
-    @TableField("organ_id")
-    private String organId;
+    @ApiModelProperty(value = "机构编码")
+    @TableField("organ_code")
+    private String organCode;
 
     @ApiModelProperty("学习项目ID")
     @TableField("learning_project_id")

src/main/java/cn/wisenergy/chnmuseum/party/service/LearningContentBoardService.java

@@ -23,6 +23,6 @@ public interface LearningContentBoardService extends IService<LearningContentBoa
 
     IPage<ExhibitionBoard> getBoardPageByLearningContentId(Page<ExhibitionBoard> page, String learningContentId, String nameOrCode);
 
-    IPage<Asset> getAssetPageByOrganId(Page<ExhibitionBoard> page, String organId);
+    IPage<Asset> getAssetPageByOrganCode(Page<ExhibitionBoard> page, String organCode);
 
 }

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/LearningContentBoardServiceImpl.java

@@ -38,8 +38,8 @@ public class LearningContentBoardServiceImpl extends ServiceImpl<LearningContent
     }
 
     @Override
-    public IPage<Asset> getAssetPageByOrganId(Page<ExhibitionBoard> page, String organId) {
-        return learningContentBoardMapper.selectAssetPageByOrganId(page, organId);
+    public IPage<Asset> getAssetPageByOrganCode(Page<ExhibitionBoard> page, String organCode) {
+        return learningContentBoardMapper.selectAssetPageByOrganCode(page, organCode);
     }
 
 }

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java

@@ -384,7 +384,8 @@ public class ChinaMobileRestApiController extends BaseController {
             final String assetId = exhibitionBoard.getAssetId();
             final Asset asset = this.assetService.getById(assetId);
             final String videoUrl = asset.getVideoUrl();
-            final List<VideoVo> videoVoList = JSONObject.parseObject(videoUrl, new TypeReference<List<VideoVo>>() {}, Feature.OrderedField);
+            final List<VideoVo> videoVoList = JSONObject.parseObject(videoUrl, new TypeReference<List<VideoVo>>() {
+            }, Feature.OrderedField);
             exhibitionBoard.setVideoUrlList(videoVoList.stream().map(VideoVo::getFileUrl).collect(Collectors.toList()));
             exhibitionBoard.setVideoUrl(videoUrl);
             exhibitionBoard.setLearningContentId(learningContentId);
@@ -548,7 +549,8 @@ public class ChinaMobileRestApiController extends BaseController {
         final ExhibitionBoard exhibitionBoard = this.exhibitionBoardService.getById(boardId);
 
         final String refMaterialUrl = exhibitionBoard.getRefMaterialUrl();
-        final List<DatumVo> datumVoList = JSONObject.parseObject(refMaterialUrl, new TypeReference<List<DatumVo>>() {}, Feature.OrderedField);
+        final List<DatumVo> datumVoList = JSONObject.parseObject(refMaterialUrl, new TypeReference<List<DatumVo>>() {
+        }, Feature.OrderedField);
         return getResult(datumVoList);
     }
 
@@ -575,10 +577,13 @@ public class ChinaMobileRestApiController extends BaseController {
     @ApiOperation(value = "获取当前用户可查看的视频信息", notes = "获取当前用户可查看的视频信息")
     public Map<String, Object> getAssetPageByOrganId() {
         final TUser tUser = getcurUser();
-        final String orgId = tUser.getOrgId();
-        IPage<Asset> page = this.learningContentBoardService.getAssetPageByOrganId(getPage(), orgId);
+        if (tUser != null && tUser.getOrgCode() != null) {
+            final String orgCode = tUser.getOrgCode();
+            IPage<Asset> page = this.learningContentBoardService.getAssetPageByOrganCode(getPage(), orgCode);
             return getResult(page);
         }
+        return getFailResult("400", "用户未登录");
+    }
 
     @ApiOperation(value = "app最新版本查询")
     @ApiImplicitParams({

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LearningContentController.java

@@ -77,15 +77,14 @@ public class LearningContentController extends BaseController {
     public Map<String, Object> saveLearningContent(@Validated(value = {Add.class}) LearningContent learningContent) {
         final TUser tUser = getcurUser();
         if (tUser != null) {
-            final String orgId = tUser.getOrgId();
-            learningContent.setOrganId(orgId);
+            learningContent.setOrganCode(tUser.getOrgCode());
         }
         learningContent.setAuditStatus(AuditStatusEnum.TBC.name());
         learningContent.setIsPublished(false);
         QueryWrapper<LearningContent> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("max(sortorder) as sortorder");
         LearningContent content = this.learningContentService.getOne(queryWrapper);
-        if (content != null) {
+        if (content != null && content.getSortorder() != null) {
             learningContent.setSortorder(content.getSortorder() + 1);
         } else {
             learningContent.setSortorder(1);

src/main/resources/mapper/LearningContentMapper.xml

@@ -8,7 +8,7 @@
         <result column="name" property="name"/>
         <result column="cover" property="cover"/>
         <result column="applicable_scope" property="applicableScope"/>
-        <result column="organ_id" property="organId"/>
+        <result column="organ_code" property="organCode"/>
         <result column="learning_project_id" property="learningProjectId"/>
         <result column="audit_status" property="auditStatus"/>
         <result column="is_published" property="isPublished"/>
@@ -20,7 +20,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, cover, applicable_scope, organ_id, learning_project_id, audit_status, is_published, is_deleted, sortorder, create_time, update_time
+        id, name, cover, applicable_scope, organ_code, learning_project_id, audit_status, is_published, is_deleted, sortorder, create_time, update_time
     </sql>
 
 </mapper>