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

Compare commits

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

3 Commits
b6e61961f7 ... f02aa38051

Author SHA1 Message Date
yanyang
f02aa38051 Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang 2023-03-24 11:20:52 +08:00
yanyang
7694dd8242 用户管理 创建时间 2023-03-24 11:20:42 +08:00
闫阳
64baad1a36 Merge pull request 'yanyang' (#27) from yanyang into master 
Reviewed-on: #27
 2023-03-23 17:17:53 +08:00
2 changed files with 6 additions and 4 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,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);
//更新角色菜单关系 //更新角色菜单关系

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

@ -22,6 +22,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;
@ -99,7 +100,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
//保存用户 //保存用户
entity.setSuperAdmin(SuperAdminEnum.NO.value()); entity.setSuperAdmin(SuperAdminEnum.NO.value());
BaseSupportUtils.setCommonField(entity); Timestamp timestamp = new Timestamp(System.currentTimeMillis());
entity.setCreateDate(timestamp);
insert(entity); insert(entity);
//保存角色用户关系 //保存角色用户关系
@ -120,7 +122,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
} }
//更新用户 //更新用户
BaseSupportUtils.setUpdateCommonField(entity);
updateById(entity); updateById(entity);
//更新角色用户关系 //更新角色用户关系