Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount

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

@@ -169,14 +169,15 @@ public class MsgBiz {
      * @return
      */
     public ObjectRestResponse deleteByList(String ids) {
-        if (StringUtils.isBlank(ids)) {
-            return ObjectRestResponse.paramIsEmpty();
-        }
         Integer userId = 0;
         AppUserDTO appUserDTO = userBiz.getUserInfo();
-        if(appUserDTO != null) {
-            userId = appUserDTO.getImUserid();
+        if(appUserDTO == null) {
+            return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
+        }
+        if (StringUtils.isBlank(ids)) {
+            return ObjectRestResponse.paramIsEmpty();
         }
+        userId = appUserDTO.getImUserid();
         List<String> list = Arrays.asList(ids.split(","));
         Set<String> set = new HashSet<>();
         set.addAll(list);