|
|
@ -1,9 +1,7 @@ |
|
|
|
package com.mh.user.service.impl; |
|
|
|
package com.mh.user.service.impl; |
|
|
|
|
|
|
|
|
|
|
|
import java.util.HashSet; |
|
|
|
import java.util.*; |
|
|
|
import java.util.Iterator; |
|
|
|
|
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
import java.util.Set; |
|
|
|
|
|
|
|
import com.mh.common.page.ColumnFilter; |
|
|
|
import com.mh.common.page.ColumnFilter; |
|
|
|
import com.mh.common.page.MybatisPageHelper; |
|
|
|
import com.mh.common.page.MybatisPageHelper; |
|
|
|
import com.mh.common.page.PageRequest; |
|
|
|
import com.mh.common.page.PageRequest; |
|
|
@ -18,6 +16,7 @@ import com.mh.user.model.SysUser; |
|
|
|
import com.mh.user.model.SysUserRole; |
|
|
|
import com.mh.user.model.SysUserRole; |
|
|
|
import com.mh.user.service.SysMenuService; |
|
|
|
import com.mh.user.service.SysMenuService; |
|
|
|
import com.mh.user.service.SysUserService; |
|
|
|
import com.mh.user.service.SysUserService; |
|
|
|
|
|
|
|
import com.mh.user.utils.SecurityUtils; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
@ -54,10 +53,14 @@ public class SysUserServiceImpl implements SysUserService { |
|
|
|
Long id = null; |
|
|
|
Long id = null; |
|
|
|
if(record.getId() == null || record.getId() == 0) { |
|
|
|
if(record.getId() == null || record.getId() == 0) { |
|
|
|
// 新增用户
|
|
|
|
// 新增用户
|
|
|
|
|
|
|
|
record.setCreateBy(SecurityUtils.getUsername()); |
|
|
|
|
|
|
|
record.setCreateTime(new Date()); |
|
|
|
sysUserMapper.insertSelective(record); |
|
|
|
sysUserMapper.insertSelective(record); |
|
|
|
SysUser sysUser=sysUserMapper.findByName(record.getUserName()); |
|
|
|
SysUser sysUser=sysUserMapper.findByName(record.getUserName()); |
|
|
|
id = sysUser.getId(); |
|
|
|
id = sysUser.getId(); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
|
|
|
|
record.setLastUpdateBy(SecurityUtils.getUsername()); |
|
|
|
|
|
|
|
record.setLastUpdateTime(new Date()); |
|
|
|
// 更新用户信息
|
|
|
|
// 更新用户信息
|
|
|
|
sysUserMapper.updateByPrimaryKeySelective(record); |
|
|
|
sysUserMapper.updateByPrimaryKeySelective(record); |
|
|
|
} |
|
|
|
} |
|
|
@ -199,4 +202,9 @@ public class SysUserServiceImpl implements SysUserService { |
|
|
|
public int getCount(String userName, int page, int limit) { |
|
|
|
public int getCount(String userName, int page, int limit) { |
|
|
|
return sysUserMapper.getCount(userName,page,limit); |
|
|
|
return sysUserMapper.getCount(userName,page,limit); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
|
|
public void updateLoginTime(Long id) { |
|
|
|
|
|
|
|
sysUserMapper.updateLoginTime(id); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|