From d2afa808c6b182fe5867a7df8cde3b8668b25c1d Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期六, 08 六月 2024 17:38:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java b/user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java
index a117a3d..755548b 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java
@@ -1,27 +1,20 @@
package com.yuanchu.mom.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.RolePowerDto;
-import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.mapper.PowerMapper;
import com.yuanchu.mom.mapper.RoleMapper;
-import com.yuanchu.mom.mapper.UserMapper;
import com.yuanchu.mom.pojo.Menu;
import com.yuanchu.mom.pojo.Power;
import com.yuanchu.mom.pojo.Role;
-import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.service.RoleService;
-import com.yuanchu.mom.service.UserService;
-import com.yuanchu.mom.utils.Jwt;
import com.yuanchu.mom.utils.QueryWrappers;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.DigestUtils;
import java.util.HashMap;
import java.util.List;
@@ -82,6 +75,7 @@
public int upRole(RolePowerDto rolePowerDto) {
Role role = new Role();
role.setName(rolePowerDto.getRoleName());
+ role.setCategory(rolePowerDto.getCategory());
role.setId(rolePowerDto.getRoleId2());
int up = roleMapper.updateById(role);
if (up == 1){
@@ -93,4 +87,4 @@
}
return 1;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3