Merge branch 'master-bacground-im' into dev

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/ImQuestionBiz.java

@@ -117,6 +117,18 @@ public class ImQuestionBiz extends BaseBiz<ImQuestionMapper, ImQuestion> {
         return ObjectRestResponse.succ();
     }
 
+    public ObjectRestResponse deleteById(Long id) {
+        if (id == null) {
+            return ObjectRestResponse.paramIsEmpty();
+        }
+        ImQuestion imQuestion = mapper.selectByPrimaryKey(id);
+        if (imQuestion == null) {
+            return ObjectRestResponse.createDefaultFail();
+        }
+        imQuestion.setIsDel(true);
+        updateSelectiveByIdRe(imQuestion);
+        return ObjectRestResponse.succ();
+    }
 
     public ObjectRestResponse update(Long id, MsgTypeEnum type, UpdateTypeEnum updateType) {
         if (id == null || type == null) {

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/rest/ImQuestionController.java

@@ -41,4 +41,10 @@ public class ImQuestionController {
     public ObjectRestResponse delete(Long id) {
         return imQuestionBiz.delete(id);
     }
+
+    @GetMapping(value = "/bg/app/unauth/delete")
+    @ApiOperation(value = "删除问答信息")
+    public ObjectRestResponse deleteById(Long id) {
+        return imQuestionBiz.deleteById(id);
+    }
 }