Merge remote-tracking branch 'origin/v1.0' into v1.0

src/main/java/com/qs/serve/modules/wx/controller/WxFormPushController.java

@@ -270,7 +270,13 @@ public class WxFormPushController {
     @DeleteMapping("/deleteById/{ids}")
     @SysLog(module = SystemModule.Verification, title = "表单推送", biz = BizType.DELETE)
     public R<?> deleteById(@PathVariable("ids") String ids){
-        List<String> idsLong = StringUtils.splitIdString(ids);
+        List<Long> idsLong = StringUtils.splitIdLong(ids);
+        List<WxFormPush> list = wxFormPushService.listByIds(idsLong);
+        for(WxFormPush formPush:list){
+            if(formPush.getStatus().equals("1")){
+                return R.error("已发布的消息不能删除");
+            }
+        }
         boolean result = wxFormPushService.removeByIds(idsLong);
         return R.isTrue(result);
     }