diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletPublicAccountController.java b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletPublicAccountController.java index 512c9cc..f22e10b 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletPublicAccountController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletPublicAccountController.java @@ -5,6 +5,7 @@ import java.util.stream.Collectors; import com.playlet.common.core.domain.entity.SysDept; import com.playlet.common.core.domain.entity.SysUser; +import com.playlet.common.utils.StringUtils; import com.playlet.system.domain.PlayletPublicDetail; import com.playlet.system.service.ISysDeptService; import com.playlet.system.service.ISysUserService; @@ -149,7 +150,17 @@ public class PlayletPublicAccountController extends BaseController { PlayletPublicAccount playletPublicAccount = playletPublicAccountService.selectPlayletPublicAccountById(id); mmap.put("playletPublicAccount", playletPublicAccount); - mmap.put("users",sysUserService.selectUserList(new SysUser())); + List users = sysUserService.selectUserList(new SysUser()); + if(StringUtils.isNotEmpty(playletPublicAccount.getManagerIds())){ + for (String ids : playletPublicAccount.getManagerIds().split(",")) { + users.forEach(model->{ + if(String.valueOf(model.getUserId()).equals(ids)){ + model.setFlag(true); + } + }); + } + } + mmap.put("users", users); return prefix + "/edit"; } diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletPublicDetailController.java b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletPublicDetailController.java index cfdde40..7cc11a4 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletPublicDetailController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletPublicDetailController.java @@ -218,6 +218,13 @@ public class PlayletPublicDetailController extends BaseController for (String str : arr) { PublicDetailTag tag = new PublicDetailTag(); tag.setTag(str); + if(StringUtils.isNotEmpty(playletPublicDetail.getDetailTag())){ + for (String tagName : playletPublicDetail.getDetailTag().split(",")) { + if(str.equals(tagName)){ + tag.setFlag(true); + } + } + } tags.add(tag); } mmap.put("tags", tags); diff --git a/playlet-admin/src/main/java/com/playlet/web/req/PublicDetailTag.java b/playlet-admin/src/main/java/com/playlet/web/req/PublicDetailTag.java index e675c32..0d686dd 100644 --- a/playlet-admin/src/main/java/com/playlet/web/req/PublicDetailTag.java +++ b/playlet-admin/src/main/java/com/playlet/web/req/PublicDetailTag.java @@ -10,4 +10,6 @@ public class PublicDetailTag { private String tag; + private Boolean flag; + } diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PublicDetailShareAppServiceImpl.java b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PublicDetailShareAppServiceImpl.java index c57463b..958584f 100644 --- a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PublicDetailShareAppServiceImpl.java +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PublicDetailShareAppServiceImpl.java @@ -38,16 +38,26 @@ public class PublicDetailShareAppServiceImpl implements PublicDetailShareAppServ if(userOne != null){ publicDetailShare.setReaderOneName(userOne.getName()); // 增加1的阅读标签 - if(!userOne.getRemark().contains(detail.getDetailTag())){ - userOne.setRemark(userOne.getRemark()+"|" + detail.getDetailTag()); + if(userOne.getRemark() == null || !userOne.getRemark().contains(detail.getDetailTag())){ + if(userOne.getRemark() == null){ + userOne.setRemark(detail.getDetailTag()); + }else { + userOne.setRemark(userOne.getRemark()+"|" + detail.getDetailTag()); + } iPlayletPublicUserService.updateById(userOne); } } if(userTwo != null){ publicDetailShare.setReaderTwoName(userTwo.getName()); // 增加用户2的阅读标签 - userTwo.setRemark(userTwo.getRemark()+"|" + detail.getDetailTag()); - iPlayletPublicUserService.updateById(userTwo); + if(userTwo.getRemark() == null || !userTwo.getRemark().contains(detail.getDetailTag())){ + if(userTwo.getRemark() == null){ + userTwo.setRemark(detail.getDetailTag()); + }else { + userTwo.setRemark(userTwo.getRemark()+"|" + detail.getDetailTag()); + } + iPlayletPublicUserService.updateById(userTwo); + } } // 查询是否二次记录 long readCount = iPublicDetailShareService.lambdaQuery() diff --git a/playlet-admin/src/main/resources/templates/system/dept/add.html b/playlet-admin/src/main/resources/templates/system/dept/add.html index c6ed046..21f728c 100644 --- a/playlet-admin/src/main/resources/templates/system/dept/add.html +++ b/playlet-admin/src/main/resources/templates/system/dept/add.html @@ -34,12 +34,6 @@ -
- -
- -
-
diff --git a/playlet-admin/src/main/resources/templates/system/dept/dept.html b/playlet-admin/src/main/resources/templates/system/dept/dept.html index 13dff7b..6f4286a 100644 --- a/playlet-admin/src/main/resources/templates/system/dept/dept.html +++ b/playlet-admin/src/main/resources/templates/system/dept/dept.html @@ -82,11 +82,6 @@ align: "left" }, { - field: 'detailTags', - title: '文章标签', - align: "left" - }, - { field: 'orderNum', title: '排序', align: "left" diff --git a/playlet-admin/src/main/resources/templates/system/dept/edit.html b/playlet-admin/src/main/resources/templates/system/dept/edit.html index 01078c2..93d34fe 100644 --- a/playlet-admin/src/main/resources/templates/system/dept/edit.html +++ b/playlet-admin/src/main/resources/templates/system/dept/edit.html @@ -35,12 +35,6 @@
-
- -
- -
-
diff --git a/playlet-admin/src/main/resources/templates/system/playlet/account/edit.html b/playlet-admin/src/main/resources/templates/system/playlet/account/edit.html index a95ae3a..eb3d343 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/account/edit.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/account/edit.html @@ -61,7 +61,7 @@
diff --git a/playlet-admin/src/main/resources/templates/system/playlet/detail/add.html b/playlet-admin/src/main/resources/templates/system/playlet/detail/add.html index 7022db9..34a9d05 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/detail/add.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/detail/add.html @@ -4,6 +4,7 @@ + @@ -95,11 +96,10 @@
- -
- +
@@ -175,6 +175,7 @@ + @@ -184,6 +185,13 @@ focusCleanup: true }); + $(function() { + $('#detailTags').select2({ + placeholder: "请选择文章标签", + allowClear: true + }); + }) + // 详情页 $("#imgUrlFile").fileinput({ uploadUrl: ctx + 'tool/oss/uploadFromPlaylet', @@ -245,7 +253,8 @@ function submitHandler() { if ($.validate.form()) { var content = tinymce.get('mytextarea').getContent(); - $.operate.save(prefix + "/add", $('#form-detail-add').serialize() + encodeURIComponent(content)); + var detailTag = $.form.selectSelects("detailTags"); + $.operate.save(prefix + "/add", $('#form-detail-add').serialize() + encodeURIComponent(content) + "&detailTag=" + detailTag); } } diff --git a/playlet-admin/src/main/resources/templates/system/playlet/detail/edit.html b/playlet-admin/src/main/resources/templates/system/playlet/detail/edit.html index c5aefe6..4fedc05 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/detail/edit.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/detail/edit.html @@ -4,6 +4,7 @@ + @@ -84,11 +85,10 @@
- +
- +
@@ -104,6 +104,7 @@ + @@ -113,10 +114,18 @@ focusCleanup: true }); + $(function() { + $('#detailTags').select2({ + placeholder: "请选择文章标签", + allowClear: true + }); + }) + function submitHandler() { if ($.validate.form()) { var content = tinymce.get('mytextarea').getContent(); - $.operate.save(prefix + "/edit", $('#form-detail-edit').serialize() + encodeURIComponent(content)); + var detailTag = $.form.selectSelects("detailTags"); + $.operate.save(prefix + "/edit", $('#form-detail-edit').serialize() + encodeURIComponent(content) + "&detailTag=" + detailTag); } } diff --git a/playlet-common/src/main/java/com/playlet/common/core/domain/entity/SysUser.java b/playlet-common/src/main/java/com/playlet/common/core/domain/entity/SysUser.java index bf9df8a..803e8f1 100644 --- a/playlet-common/src/main/java/com/playlet/common/core/domain/entity/SysUser.java +++ b/playlet-common/src/main/java/com/playlet/common/core/domain/entity/SysUser.java @@ -75,6 +75,8 @@ public class SysUser extends BaseEntity /** 删除标志(0代表存在 2代表删除) */ private String delFlag; + private boolean flag; + /** 最后登录IP */ @Excel(name = "最后登录IP", type = Type.EXPORT) private String loginIp; @@ -106,6 +108,14 @@ public class SysUser extends BaseEntity } + public boolean isFlag() { + return flag; + } + + public void setFlag(boolean flag) { + this.flag = flag; + } + public SysUser(Long userId) { this.userId = userId; diff --git a/playlet-system/src/main/resources/mapper/system/PlayletPublicAccountMapper.xml b/playlet-system/src/main/resources/mapper/system/PlayletPublicAccountMapper.xml index 3b6574e..17ee94d 100644 --- a/playlet-system/src/main/resources/mapper/system/PlayletPublicAccountMapper.xml +++ b/playlet-system/src/main/resources/mapper/system/PlayletPublicAccountMapper.xml @@ -96,15 +96,15 @@ update playlet_public_account name = #{name}, - public_type = #{publicType}, - detail_type = #{detailType}, - detail_tags = #{detailTags}, - introduction = #{introduction}, - author_alias = #{authorAlias}, - manager_id = #{managerId}, - manager_ids = #{managerIds}, - logo_url = #{logoUrl}, - address = #{address}, + public_type = #{publicType}, + detail_type = #{detailType}, + detail_tags = #{detailTags}, + introduction = #{introduction}, + author_alias = #{authorAlias}, + manager_id = #{managerId}, + manager_ids = #{managerIds}, + logo_url = #{logoUrl}, + address = #{address}, original_content_count = #{originalContentCount}, followers_count = #{followersCount}, create_by = #{createBy},