删除调整

src/main/resources/templates/admin/article/list.html

@@ -133,7 +133,7 @@
             width: 180,
             formatter: function (value, row, index) {
                 var edit = editFlag ? row.approvalStatus != 1 ? '<button class="btn btn-info btn-sm ml-1 btn_assign" onclick="editArticle(' + row.id + ')">编辑</button>': (row.userInfoName=='admin'||row.userInfoName=='ptspyh') ? '<button class="btn btn-info btn-sm ml-1 btn_assign" onclick="editArticle(' + row.id + ')">编辑</button>' :'' : '';
-                var del = deleteFlag ? '<button class="btn btn-danger btn-sm ml-1 btn_del" onclick="deleteArticle(' + row.id + ')">删除</button>' : '';
+                var del = deleteFlag ? row.approvalStatus != 1 ? '<button class="btn btn-danger btn-sm ml-1 btn_del" onclick="deleteArticle(' + row.id + ')">删除</button>' : (row.userInfoName=='admin'||row.userInfoName=='ptspyh') ? '<button class="btn btn-danger btn-sm ml-1 btn_del" onclick="deleteArticle(' + row.id + ')">删除</button>' :'': '';
                 return  edit + del;
             }
         }];