bug fixed

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

@@ -25,7 +25,6 @@ public interface AssetMapper extends BaseMapper<Asset> {
             "and vc.video_content_cat_id = vcc.id " +
             "and vc.video_content_copyright_owner_id = co.id " +
             "and vc.is_published = 1 and vc.is_deleted = 0 " +
-            "and co.is_deleted = 0 and vcc.is_deleted = 0 " +
             "<![CDATA[and co.expire_date_start <= DATE_FORMAT(now(), '%Y-%m-%d') ]]>" +
             "<![CDATA[and co.expire_date_end >= DATE_FORMAT(now(), '%Y-%m-%d') ]]>" +
             "<if test='videoContentCatId != null'>and vcc.id = #{videoContentCatId} </if>" +

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

@@ -67,11 +67,6 @@ public class CopyrightOwner implements Serializable {
     @Length(min = 0, max = 100, message = "备注的字数超过最大限制100")
     private String remarks;
 
-    @ApiModelProperty("是否已删除")
-    @TableField("is_deleted")
-    @TableLogic
-    private Boolean deleted;
-
     @ApiModelProperty("创建日期")
     @TableField(value = "create_time", fill = FieldFill.INSERT)
     private LocalDateTime createTime;

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

@@ -54,11 +54,6 @@ public class VideoContentCat implements Serializable {
     @Length(min = 0, max = 100, message = "备注的字数超过最大限制100")
     private String remarks;
 
-    @ApiModelProperty("是否已删除")
-    @TableField("is_deleted")
-    @TableLogic
-    private Boolean deleted;
-
     @ApiModelProperty("创建日期")
     @TableField(value = "create_time", fill = FieldFill.INSERT)
     private LocalDateTime createTime;

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

@@ -66,6 +66,9 @@ public class CopyrightOwnerController extends BaseController {
     @Resource
     private ExhibitionBoardService exhibitionBoardService;
 
+    @Resource
+    private LearningContentCopyrightOwnerService learningContentCopyrightOwnerService;
+
     @PostMapping("/save")
     @RequiresAuthentication  //@RequiresPermissions("copyright:owner:save")
     @ApiOperation(value = "添加版权方", notes = "添加版权方")
@@ -299,6 +302,9 @@ public class CopyrightOwnerController extends BaseController {
         LambdaUpdateWrapper<CopyrightOwnerVideoContentCat> deleteWrapper1 = Wrappers.<CopyrightOwnerVideoContentCat>lambdaUpdate().eq(CopyrightOwnerVideoContentCat::getCopyrightOwnerId, id);
         this.copyrightOwnerVideoContentCatService.remove(deleteWrapper1);
 
+        LambdaUpdateWrapper<LearningContentCopyrightOwner> deleteWrapper2 = Wrappers.<LearningContentCopyrightOwner>lambdaUpdate().eq(LearningContentCopyrightOwner::getCopyrightOwnerId, id);
+        this.learningContentCopyrightOwnerService.remove(deleteWrapper2);
+
         return getSuccessResult();
     }
 

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

@@ -192,7 +192,7 @@ public class ExhibitionBoardCatController extends BaseController {
     @RequiresAuthentication  //@RequiresPermissions("exhibition:board:cat:delete")
     @ApiOperation(value = "根据ID删除展板分类", notes = "根据ID删除展板分类")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
+            @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String", required = true)
     })
     @MethodLog(operModule = OperModule.DISPLAYCLASSIFY, operType = OperType.DELETE)
     public Map<String, Object> deleteExhibitionBoardCat(@PathVariable("id") String id) {

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

@@ -75,17 +75,6 @@ public class LearningProjectController extends BaseController {
         return getFailResult();
     }
 
-    @DeleteMapping("/delete/{id}")
-    @RequiresAuthentication  //@RequiresPermissions("learning:project:delete")
-    @ApiOperation(value = "根据ID下架学习项目", notes = "根据ID下架学习项目")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
-    })
-    @MethodLog(operModule = OperModule.LEARNPROJECT, operType = OperType.DELETE)
-    public Map<String, Object> deleteLearningProject(@PathVariable("id") String id) {
-        return getSuccessResult();
-    }
-
     @GetMapping("/getList")
     @RequiresAuthentication  //@RequiresPermissions("learning:project:list")
     @ApiOperation(value = "获取全部列表(无分页)", notes = "获取全部列表(无分页)")
@@ -139,7 +128,7 @@ public class LearningProjectController extends BaseController {
 
     @ApiOperation(value = "获取详情", notes = "获取详情")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "标识ID", dataType = "String", paramType = "path")
+            @ApiImplicitParam(name = "id", value = "标识ID", dataType = "String", paramType = "path", required = true)
     })
     @GetMapping("/get/{id}")
     @RequiresAuthentication  //@RequiresPermissions("learning:project:get:id")
@@ -149,5 +138,17 @@ public class LearningProjectController extends BaseController {
         return getResult(learningProject);
     }
 
+    @DeleteMapping("/delete/{id}")
+    @RequiresAuthentication  //@RequiresPermissions("learning:project:delete")
+    @ApiOperation(value = "根据ID下架学习项目", notes = "根据ID下架学习项目")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String", required = true)
+    })
+    @MethodLog(operModule = OperModule.LEARNPROJECT, operType = OperType.DELETE)
+    public Map<String, Object> deleteLearningProject(@PathVariable("id") String id) {
+        this.learningProjectService.removeById(id);
+        return getSuccessResult();
+    }
+
 }
 

src/main/resources/mapper/CopyrightOwnerMapper.xml

@@ -10,14 +10,13 @@
         <result column="expire_date_start" property="expireDateStart"/>
         <result column="expire_date_end" property="expireDateEnd"/>
         <result column="remarks" property="remarks"/>
-        <result column="is_deleted" property="deleted"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, owner_type, expire_date_start, expire_date_end, remarks, is_deleted, create_time, update_time
+        id, name, owner_type, expire_date_start, expire_date_end, remarks, create_time, update_time
     </sql>
 
 </mapper>

src/main/resources/mapper/VideoContentCatMapper.xml

@@ -8,14 +8,13 @@
         <result column="name" property="name"/>
         <result column="copyright_owner_id" property="copyrightOwnerId"/>
         <result column="remarks" property="remarks"/>
-        <result column="is_deleted" property="deleted"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, copyright_owner_id, remarks, is_deleted, create_time, update_time
+        id, name, copyright_owner_id, remarks, create_time, update_time
     </sql>
 
 </mapper>