CaiXiang/cigs4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: CaiXiang:f02aa38051b9f312cf56ab27312677777f65d554
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs
..
compare: CaiXiang:b6e61961f7ef54cf28fc596bdd6983b173203e01
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs

No commits in common. "f02aa38051b9f312cf56ab27312677777f65d554" and "b6e61961f7ef54cf28fc596bdd6983b173203e01" have entirely different histories.
f02aa38051 ... b6e61961f7

2 changed files with 4 additions and 6 deletions
Show Stats Expand all files Collapse all files

5
ym-admin/src/main/java/com/cnbm/admin/service/impl/SysRoleServiceImpl.java
View File

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

5
ym-admin/src/main/java/com/cnbm/admin/service/impl/SysUserServiceImpl.java
View File

@ -22,7 +22,6 @@ import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.sql.Timestamp;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@ -100,8 +99,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
//保存用户
entity.setSuperAdmin(SuperAdminEnum.NO.value());
Timestamp timestamp = new Timestamp(System.currentTimeMillis());
entity.setCreateDate(timestamp);
BaseSupportUtils.setCommonField(entity);
insert(entity);
//保存角色用户关系
@ -122,6 +120,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
}
//更新用户
BaseSupportUtils.setUpdateCommonField(entity);
updateById(entity);
//更新角色用户关系