Merge remote-tracking branch 'origin/master' into develop

publiccms-parent/publiccms-core/src/main/java/com/publiccms/controller/web/IndexController.java

@@ -166,6 +166,16 @@ public class IndexController {
                 String loginPath = config.get(LoginConfigComponent.CONFIG_LOGIN_PATH);
                 StringBuilder sb = new StringBuilder(UrlBasedViewResolver.REDIRECT_URL_PREFIX);
                 if (CommonUtils.notEmpty(loginPath)) {
+                    if (null != id) {
+                        int index = requestPath.lastIndexOf(CommonConstants.DOT);
+                        if (0 < index) {
+                            requestPath = requestPath.substring(0, index);
+                        }
+                        requestPath = requestPath + CommonConstants.SEPARATOR + id;
+                        if (null != pageIndex) {
+                            requestPath = requestPath + CommonConstants.UNDERLINE + pageIndex;
+                        }
+                    }
                     return sb.append(loginPath).append("?returnUrl=")
                             .append(RequestUtils.getEncodePath(requestPath, request.getQueryString())).toString();
                 } else {

publiccms-parent/publiccms-core/src/main/java/com/publiccms/controller/web/cms/CommentController.java

@@ -70,7 +70,8 @@ public class CommentController {
             entity.setStatus(CmsCommentService.STATUS_PEND);
             if (null != entity.getId()) {
                 CmsComment oldEntity = service.getEntity(entity.getId());
-                if (null != oldEntity && !oldEntity.isDisabled() && oldEntity.getUserId() == user.getId()) {
+                if (null != oldEntity && !oldEntity.isDisabled()
+                        && (oldEntity.getUserId() == user.getId() || user.isSuperuserAccess())) {
                     entity.setUpdateDate(CommonUtils.getDate());
                     entity = service.update(entity.getId(), entity, ignoreProperties);
                     logOperateService

publiccms-parent/publiccms-core/src/main/java/com/publiccms/controller/web/cms/ContentController.java

@@ -111,14 +111,15 @@ public class ContentController {
         CmsContentAdminController.initContent(entity, cmsModel, draft, false, attribute, false, CommonUtils.getDate());
         if (null != entity.getId()) {
             CmsContent oldEntity = service.getEntity(entity.getId());
-            if (null == oldEntity || ControllerUtils.verifyNotEquals("siteId", site.getId(), oldEntity.getSiteId(), model)) {
-                return UrlBasedViewResolver.REDIRECT_URL_PREFIX + returnUrl;
-            }
-            entity = service.update(entity.getId(), entity, entity.isOnlyUrl() ? CmsContentAdminController.ignoreProperties
-                    : CmsContentAdminController.ignorePropertiesWithUrl);
-            if (null != entity.getId()) {
-                logOperateService.save(new LogOperate(site.getId(), user.getId(), LogLoginService.CHANNEL_WEB, "update.content",
-                        RequestUtils.getIpAddress(request), CommonUtils.getDate(), JsonUtils.getString(entity)));
+            if (null != oldEntity && ControllerUtils.verifyNotEquals("siteId", site.getId(), oldEntity.getSiteId(), model)
+                    && (oldEntity.getUserId() == user.getId() || user.isSuperuserAccess())) {
+                entity = service.update(entity.getId(), entity, entity.isOnlyUrl() ? CmsContentAdminController.ignoreProperties
+                        : CmsContentAdminController.ignorePropertiesWithUrl);
+                if (null != entity.getId()) {
+                    logOperateService
+                            .save(new LogOperate(site.getId(), user.getId(), LogLoginService.CHANNEL_WEB, "update.content",
+                                    RequestUtils.getIpAddress(request), CommonUtils.getDate(), JsonUtils.getString(entity)));
+                }
             }
         } else {
             entity.setContribute(true);

publiccms-parent/publiccms-core/src/main/java/com/publiccms/logic/component/site/MenuMessageComponent.java

@@ -82,10 +82,10 @@ public class MenuMessageComponent extends AbstractMessageSource implements Cache
             synchronized (messageCache) {
                 messageMap = messageCache.get(lang);
                 if (null == messageMap) {
+                    messageMap = new HashMap<>();
                     @SuppressWarnings("unchecked")
                     List<SysModuleLang> list = (List<SysModuleLang>) sysModuleLangService.getList(null, lang);
                     if (CommonUtils.notEmpty(list)) {
-                        messageMap = new HashMap<>();
                         for (SysModuleLang entity : list) {
                             messageMap.put(PREFIX + entity.getId().getModuleId(), entity.getValue());
                         }

publiccms-parent/publiccms-core/src/main/java/com/publiccms/logic/dao/cms/CmsContentDao.java

@@ -229,8 +229,12 @@ public class CmsContentDao extends BaseDao<CmsContent> {
                 queryHandler.condition("bean.categoryId in (:categoryIds)").setParameter("categoryIds",
                         queryEntitry.getCategoryIds());
             }
-            if (null != queryEntitry.getEmptyParent() && queryEntitry.getEmptyParent()) {
-                queryHandler.condition("bean.parentId is null");
+            if (null != queryEntitry.getEmptyParent()) {
+                if(queryEntitry.getEmptyParent()) {
+                    queryHandler.condition("bean.parentId is null");
+                }else {
+                    queryHandler.condition("bean.parentId is not null");
+                }
             }
         }
         if (null != queryEntitry.getDisabled()) {