diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java index 6641d8114..c1e0be3e9 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java @@ -85,4 +85,13 @@ public class InvestRemindController extends InvestBaseController { return execute(ids, p -> investRemindService.removeByIds(Arrays.asList(p))); } + /** + * 删除登录用户全部提醒 + */ + @SystemServiceLog + @PostMapping("/deleteAll") + public InvestResultData deleteAll() { + return execute(null, p -> investRemindService.removeAll()); + } + } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java index 627a8ce1e..b67b16367 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java @@ -9,6 +9,7 @@ import com.iformall.service.invest.InvestTaskService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -35,9 +36,10 @@ public class InvestTaskController extends InvestBaseController { /** * 分页列表 */ + //@RequiresPermissions("InvestTaskQuery") @SystemServiceLog @ApiOperation("分页列表接口") - @GetMapping("/list") + @PostMapping("/list") public InvestResultData> list(InvestTaskQuery params) { return execute(params, p -> bizService.queryPageTask(p)); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java b/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java index d056d2497..7adeec629 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java @@ -69,4 +69,8 @@ public class MallPermission extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="子菜单",name="children") private List children; + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="页面按钮",name="btnChildren") + private List btnChildren; + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/MallPermissionMapper.java b/mallinkService/src/main/java/com/iformall/mapper/MallPermissionMapper.java index a483bef09..4898a5de2 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/MallPermissionMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/MallPermissionMapper.java @@ -12,6 +12,8 @@ public interface MallPermissionMapper extends CommonMapper queryListParentId(Long parentId); + List queryBtnListByParentId(Long parentId); + List queryNotButtonList(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java index 48b02fee2..021eb2f7c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java @@ -16,13 +16,13 @@ import com.iformall.mapper.MallPermissionMapper; import com.iformall.mapper.MallUserInfoMapper; import com.iformall.mapper.WxMallMapper; import com.iformall.service.MallPermissionService; +import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; +import java.util.*; @Service public class MallPermissionServiceImpl implements MallPermissionService { @@ -137,13 +137,16 @@ public class MallPermissionServiceImpl implements MallPermissionService { if(entity.getResourceType().equals(EnumPermissionType.CATALOG.getCode())){ entity.setChildren(getMenuTreeList(queryListParentId(entity.getId(), menuIdList, boolNav), menuIdList, boolNav)); } + List btnList = mallPermissionMapper.queryBtnListByParentId(entity.getId()); + if (CollectionUtils.isNotEmpty(btnList)) { + entity.setBtnChildren(btnList); + } subMenuList.add(entity); } return subMenuList; } - @Override public PageInfo listAsPage(MallPermission record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> mallPermissionMapper.findList(record)); diff --git a/mallinkService/src/main/java/com/iformall/service/invest/InvestRemindService.java b/mallinkService/src/main/java/com/iformall/service/invest/InvestRemindService.java index c14fd619f..528945552 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/InvestRemindService.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/InvestRemindService.java @@ -15,5 +15,7 @@ import com.iformall.domain.vo.invest.InvestPageResult; public interface InvestRemindService extends IService,InvestBaseService { InvestPageResult queryPage(InvestPageQuery params); + + boolean removeAll() ; } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java index 0ad3c0f59..2ad4e633f 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java @@ -29,7 +29,7 @@ public class InvestFollowRecordServiceImpl extends InvestBaseServiceImpl queryPage(InvestPageQuery params) { InvestFollowRecordEntity queryData = params.getQueryData(); InvestHelper.notNull(queryData); - InvestHelper.notNull(queryData.getFollowId(), "followId"); + //InvestHelper.notNull(queryData.getFollowId(), "followId"); InvestHelper.notNull(queryData.getType(), "type"); return super.queryPage(params); } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestRemindServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestRemindServiceImpl.java index b9a2dd5f1..b12460a69 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestRemindServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestRemindServiceImpl.java @@ -1,6 +1,8 @@ package com.iformall.service.invest.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper; import com.iformall.domain.po.invest.InvestRemindEntity; import com.iformall.domain.vo.invest.InvestUserContext; import com.iformall.mapper.InvestRemindDao; @@ -33,6 +35,14 @@ public class InvestRemindServiceImpl extends InvestBaseServiceImpl wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(InvestRemindEntity::getTenantId, InvestUserContext.getUser().getTenantId()); + wrapper.eq(InvestRemindEntity::getOwner, InvestUserContext.getUserId()); + return super.remove(wrapper); + } + private void checkBeforeSaveOrUpdate(InvestRemindEntity input) { input.setOwner(InvestUserContext.getUserId()); if (Objects.nonNull(input.getContent())) { diff --git a/mallinkService/src/main/resources/mapper/MallPermissionMapper.xml b/mallinkService/src/main/resources/mapper/MallPermissionMapper.xml index 3cc1e65f8..81853d256 100644 --- a/mallinkService/src/main/resources/mapper/MallPermissionMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallPermissionMapper.xml @@ -96,6 +96,13 @@ where 1=1 and `parent_id` = #{value} and available = 'Y' order by sort asc + +