角色菜单处理 非空判断

src/main/java/com/imed/costaccount/model/Role.java

@@ -2,15 +2,13 @@ package com.imed.costaccount.model;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * 角色
  * 
@@ -52,4 +50,6 @@ public class Role implements Serializable {
 	 */
 	private Long createTime;
 
+
+
 }

src/main/java/com/imed/costaccount/service/MenuService.java

@@ -2,14 +2,13 @@ package com.imed.costaccount.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.imed.costaccount.common.util.PageUtils;
+import com.imed.costaccount.model.Menu;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.MenuEditDTO;
 import com.imed.costaccount.model.dto.MenuSaveDTO;
-import com.imed.costaccount.model.Menu;
 import com.imed.costaccount.model.vo.NavVO;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 菜单管理

src/main/java/com/imed/costaccount/service/RoleService.java

@@ -29,9 +29,10 @@ public interface RoleService extends IService<Role> {
      * @param pageSize 每页展示数据条数
      * @param keyword 模糊匹配关键字
      * @param user 当前登录用户
+     * @param modifyTime
      * @return {@link PageUtils} 分页对象
      */
-    PageUtils selectList(Integer page, Integer pageSize, String keyword, User user);
+    PageUtils selectList(Integer page, Integer pageSize, String keyword, User user, String modifyTime);
 
     /**
      * 编辑某个角色

src/main/java/com/imed/costaccount/service/impl/CostIncomeGroupSetServiceImpl.java

@@ -65,7 +65,7 @@ public class CostIncomeGroupSetServiceImpl extends ServiceImpl<CostIncomeGroupSe
             final Map<String, String> listMap = responsibilityList.stream().collect(Collectors.toMap(Responsibility::getResponsibilityCode, Responsibility::getResponsibilityName));
             costIncomeGroupSetVOList.forEach(i -> {
                 String responsibilityCode = i.getResponsibilityCode();
-                if (StringUtils.isEmpty(responsibilityCode)){
+                if (!StringUtils.isEmpty(responsibilityCode)){
                     List<String> responsibilityCodeList = Arrays.asList(responsibilityCode.split(StrUtil.SLASH));
                     if (CollectionUtils.isEmpty(responsibilityCodeList)) {
                         String responsibilityName = listMap.get(responsibilityCodeList.get(responsibilityCodeList.size()-1));

src/main/java/com/imed/costaccount/service/impl/MenuServiceImpl.java

@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.imed.costaccount.common.constants.Constant;
 import com.imed.costaccount.common.exception.CostException;
+import com.imed.costaccount.common.util.BeanUtil;
 import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.mapper.MenuMapper;
-import com.imed.costaccount.mapper.RoleMapper;
 import com.imed.costaccount.model.Menu;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.MenuEditDTO;
@@ -17,13 +17,14 @@ import com.imed.costaccount.model.vo.MenuVO;
 import com.imed.costaccount.model.vo.NavVO;
 import com.imed.costaccount.service.MenuService;
 import com.imed.costaccount.service.UserService;
-import com.imed.costaccount.common.util.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Slf4j

src/main/java/com/imed/costaccount/service/impl/RoleServiceImpl.java

@@ -1,5 +1,6 @@
 package com.imed.costaccount.service.impl;
 
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -13,7 +14,6 @@ import com.imed.costaccount.model.Role;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.RoleEditDTO;
 import com.imed.costaccount.model.dto.RoleSaveDTO;
-import com.imed.costaccount.model.vo.CommonVO;
 import com.imed.costaccount.model.vo.RoleVO;
 import com.imed.costaccount.service.*;
 import lombok.extern.slf4j.Slf4j;
@@ -44,7 +44,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
      * @param user
      */
     @Override
-    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void saveRole(RoleSaveDTO roleSaveDTO, User user) {
         Role role = BeanUtil.convertObj(roleSaveDTO, Role.class);
         role.setCreateUserId(user.getId())
@@ -56,21 +56,25 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
     /**
      * 查询角色列表并分页
      *
-     * @param page     页码
-     * @param pageSize 每页展示数据条数
-     * @param keyword  模糊匹配关键字
-     * @param user     当前登录用户
+     * @param page       页码
+     * @param pageSize   每页展示数据条数
+     * @param keyword    模糊匹配关键字
+     * @param user       当前登录用户
+     * @param modifyTime
      * @return {@link PageUtils} 分页对象
      */
     @Override
-    public PageUtils selectList(Integer page, Integer pageSize, String keyword, User user) {
+    public PageUtils selectList(Integer page, Integer pageSize, String keyword, User user, String modifyTime) {
+        DateTime modifyDate = DateUtil.parseDate(modifyTime);
+        long startTime = DateUtil.beginOfDay(modifyDate).getTime();
+        long endTime = DateUtil.endOfDay(modifyDate).getTime();
         Page<Role> rolePage = new Page<>(page, pageSize);
         Page<Role> pages = this.page(rolePage,
                 new LambdaQueryWrapper<Role>().eq(Role::getHospId, user.getHospId())
-                        .and( StrUtil.isNotBlank(keyword), i -> i.eq( Role::getRoleName, keyword)
+                        .and(StrUtil.isNotBlank(keyword), i -> i.eq(Role::getRoleName, keyword)
                                 .or()
                                 .eq(Role::getRemark, keyword))
-
+                        .between(StrUtil.isNotBlank(modifyTime), Role::getCreateTime, startTime, endTime)
         );
         List<Role> records = pages.getRecords();
         List<RoleVO> list = records.stream().map(i -> {
@@ -82,7 +86,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
             return roleVO;
         }).collect(Collectors.toList());
 
-        return new PageUtils(list, (int) pages.getTotal(),pageSize,page);
+        return new PageUtils(list, (int) pages.getTotal(), pageSize, page);
     }
 
 
@@ -90,10 +94,10 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
      * 编辑某个角色
      *
      * @param roleEditDTO {@link RoleEditDTO}
-     * @param userId 当前登录人id
+     * @param userId      当前登录人id
      */
     @Override
-    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void updateRole(RoleEditDTO roleEditDTO, Long userId) {
         Role byId = this.getById(roleEditDTO.getRoleId());
         if (Objects.isNull(byId)) {
@@ -103,7 +107,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
         byId.setCreateTime(System.currentTimeMillis());
         byId.setCreateUserId(userId);
 
-        log.info("byId:{}",byId);
+        log.info("byId:{}", byId);
         this.updateById(byId);
     }
 }

src/main/java/com/imed/costaccount/web/RoleController.java

@@ -6,7 +6,6 @@ import com.imed.costaccount.model.dto.RoleEditDTO;
 import com.imed.costaccount.model.dto.RoleMenuDTO;
 import com.imed.costaccount.model.dto.RoleSaveDTO;
 import com.imed.costaccount.model.dto.RoleUserDTO;
-import com.imed.costaccount.model.vo.CommonSelectVO;
 import com.imed.costaccount.model.vo.CommonVO;
 import com.imed.costaccount.service.RoleMenuService;
 import com.imed.costaccount.service.RoleService;
@@ -48,8 +47,9 @@ public class RoleController extends AbstractController {
     @GetMapping("/list")
     public Result list(@RequestParam(defaultValue = "1", value = "current") Integer page,
                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                       @RequestParam(value = "keyword", required = false) String keyword) {
-        PageUtils pageUtils = roleService.selectList(page, pageSize, keyword, getUser());
+                       @RequestParam(value = "roleName", required = false) String keyword,
+                       @RequestParam(value = "modifyTime", required = false) String modifyTime) {
+        PageUtils pageUtils = roleService.selectList(page, pageSize, keyword, getUser(),modifyTime);
         return Result.ok(pageUtils);
     }