|
@@ -21,6 +21,7 @@ import org.springframework.security.core.context.SecurityContextHolder; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
|
|
|
|
import java.sql.Timestamp; |
|
|
import java.util.Arrays; |
|
|
import java.util.Arrays; |
|
|
import java.util.List; |
|
|
import java.util.List; |
|
|
import java.util.Map; |
|
|
import java.util.Map; |
|
@@ -90,7 +91,8 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit |
|
|
SysRoleEntity entity = ConvertUtils.sourceToTarget(dto, SysRoleEntity.class); |
|
|
SysRoleEntity entity = ConvertUtils.sourceToTarget(dto, SysRoleEntity.class); |
|
|
|
|
|
|
|
|
//保存角色 |
|
|
//保存角色 |
|
|
BaseSupportUtils.setCommonField(entity); |
|
|
|
|
|
|
|
|
Timestamp timestamp = new Timestamp(System.currentTimeMillis()); |
|
|
|
|
|
entity.setCreateDate(timestamp); |
|
|
insert(entity); |
|
|
insert(entity); |
|
|
|
|
|
|
|
|
//保存角色菜单关系 |
|
|
//保存角色菜单关系 |
|
@@ -106,7 +108,6 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit |
|
|
SysRoleEntity entity = ConvertUtils.sourceToTarget(dto, SysRoleEntity.class); |
|
|
SysRoleEntity entity = ConvertUtils.sourceToTarget(dto, SysRoleEntity.class); |
|
|
|
|
|
|
|
|
//更新角色 |
|
|
//更新角色 |
|
|
BaseSupportUtils.setUpdateCommonField(entity); |
|
|
|
|
|
updateById(entity); |
|
|
updateById(entity); |
|
|
|
|
|
|
|
|
//更新角色菜单关系 |
|
|
//更新角色菜单关系 |
|
|