diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/TodoCenterMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/TodoCenterMapper.java index d5b9363e4..13bec5b5a 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/TodoCenterMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/TodoCenterMapper.java @@ -18,4 +18,9 @@ public interface TodoCenterMapper { Integer countSdtDre(@Param("userName") String userName); Integer countState(@Param("manifestId") String manifestId); + + int listForTodoCenter(@Param("state") String state, + @Param("userId") String userId, + @Param("userName") String userName, + @Param("projectStatus") String projectStatus); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml index 1a2deaf32..c69444d63 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml @@ -54,4 +54,40 @@ select id from params_collect_manifest where params_manifest_id = #{manifestId} and state in('7','8') ) + + diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java index af4973242..82e299387 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java @@ -1,18 +1,25 @@ package com.jero.modules.system.service.impl; -import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.CacheConstant; import com.jero.common.constant.CommonConstant; +import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; +import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.oConvertUtils; import com.jero.modules.system.entity.SysPermission; import com.jero.modules.system.entity.SysPermissionDataRule; -import com.jero.modules.system.mapper.*; +import com.jero.modules.system.enums.DicCodeEnum; +import com.jero.modules.system.mapper.SysDepartPermissionMapper; +import com.jero.modules.system.mapper.SysDepartRolePermissionMapper; +import com.jero.modules.system.mapper.SysPermissionMapper; +import com.jero.modules.system.mapper.SysRolePermissionMapper; +import com.jero.modules.system.mapper.TodoCenterMapper; import com.jero.modules.system.model.TreeModel; +import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysPermissionDataRuleService; import com.jero.modules.system.service.ISysPermissionService; import org.apache.shiro.SecurityUtils; @@ -27,6 +34,7 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** *
@@ -41,7 +49,7 @@ public class SysPermissionServiceImpl extends ServiceImpl