ソースを参照

后台提示调整

huangct 8 年 前
コミット
de9c834355

+ 2 - 2
jpress-web-admin/src/main/java/io/jpress/admin/controller/_ContentController.java

@@ -431,9 +431,9 @@ public class _ContentController extends JBaseCRUDController<Content> {
 						isSameAsOld = false;
 						isSameAsOld = false;
 					} else if (!StringUtils.isEqual(content.getSummary(),oldContent.getSummary())) {
 					} else if (!StringUtils.isEqual(content.getSummary(),oldContent.getSummary())) {
 						isSameAsOld = false;
 						isSameAsOld = false;
-					} else if (content.getViewCount() != oldContent.getViewCount()) {
+					} else if ((content.getViewCount() == null ? 0:content.getViewCount()) != (oldContent.getViewCount() == null ? 0:oldContent.getViewCount())) {
 						isSameAsOld = false;
 						isSameAsOld = false;
-					} else if (content.getVoteUp() != oldContent.getVoteUp()) {
+					} else if ((content.getVoteUp() == null ? 0:content.getVoteUp()) != (oldContent.getVoteUp() == null ? 0:oldContent.getVoteUp())) {
 						isSameAsOld = false;
 						isSameAsOld = false;
 					} else if (!StringUtils.isEqual(content.getCommentStatus(),oldContent.getCommentStatus())) {
 					} else if (!StringUtils.isEqual(content.getCommentStatus(),oldContent.getCommentStatus())) {
 						isSameAsOld = false;
 						isSameAsOld = false;

+ 5 - 4
jpress-web-admin/src/main/webapp/WEB-INF/admin/content/edit.html

@@ -154,16 +154,17 @@ function turnPage(turnpage){
 				if(data.errorCode == 0){
 				if(data.errorCode == 0){
 					$("#content_id").attr("value",data.data);
 					$("#content_id").attr("value",data.data);
 					toastr.success('保存成功!','操作成功');
 					toastr.success('保存成功!','操作成功');
+
+					if (data.message != null) {
+						toastr.info(data.message);
+					}
+
 					if(turnpage) {
 					if(turnpage) {
 						turnPage(turnpage);
 						turnPage(turnpage);
                     }
                     }
 				}else{
 				}else{
 					toastr.error(data.message,'操作失败');
 					toastr.error(data.message,'操作失败');
 				}
 				}
-				if (data.message != null) {
-					toastr.info(data.message);
-				}
-
 			},
 			},
 			error : function() {
 			error : function() {
 				alert("检查网络连接情况是否正常或标题是否重复");
 				alert("检查网络连接情况是否正常或标题是否重复");