|
@@ -33,7 +33,6 @@ import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.UUID;
|
|
|
|
|
|
-import static org.jeecg.common.constant.CommonConstant.REGISTER_ORG_CODE;
|
|
|
import static org.jeecg.common.constant.CommonConstant.SC_INTERNAL_SERVER_ERROR_500;
|
|
|
|
|
|
@Service
|
|
@@ -75,13 +74,11 @@ public class UserServiceImpl implements IUserService {
|
|
|
.setPassword(openid)
|
|
|
.setStatus(1)
|
|
|
.setDelFlag(0)
|
|
|
+ .setUserIdentity(3)
|
|
|
.setSalt(oConvertUtils.randomGen(8))
|
|
|
.setCreateBy("admin")
|
|
|
.setRealname("微信用户")
|
|
|
- .setUsername("微信用户_" + UUID.randomUUID())
|
|
|
- .setOrgCode(REGISTER_ORG_CODE);
|
|
|
- SysDepart sysDepart = sysDepartMapper.selectOne(Wrappers.<SysDepart>lambdaQuery().eq(SysDepart::getOrgCode, REGISTER_ORG_CODE));
|
|
|
- sysUserDepartMapper.insert(new SysUserDepart(user.getId(),sysDepart.getId()));
|
|
|
+ .setUsername("微信用户_" + UUID.randomUUID());
|
|
|
boolean result = sysUserMapper.insert(user) > 0;
|
|
|
if (!result) {
|
|
|
throw new JeecgBootException("登录失败", SC_INTERNAL_SERVER_ERROR_500);
|
|
@@ -133,7 +130,7 @@ public class UserServiceImpl implements IUserService {
|
|
|
if(null != nickName && !nickName.isEmpty()){
|
|
|
sysUserMapper.update(null,Wrappers.<SysUser>lambdaUpdate()
|
|
|
.eq(SysUser::getId, user.getId())
|
|
|
- .set(SysUser::getUsername, nickName));
|
|
|
+ .set(SysUser::getRealname, nickName));
|
|
|
}else if(null != avatarUrl && !avatarUrl.isEmpty()){
|
|
|
sysUserMapper.update(null,Wrappers.<SysUser>lambdaUpdate()
|
|
|
.eq(SysUser::getId, user.getId())
|
|
@@ -148,7 +145,7 @@ public class UserServiceImpl implements IUserService {
|
|
|
SysUser sysUser = sysUserMapper.selectById(user.getId());
|
|
|
return new LoginUserVO()
|
|
|
.setId(sysUser.getId())
|
|
|
- .setUserName(sysUser.getUsername())
|
|
|
+ .setUserName(sysUser.getRealname())
|
|
|
.setUserAvatar(sysUser.getAvatar())
|
|
|
.setToken(JwtUtil.sign(sysUser.getUsername(), sysUser.getPassword()));
|
|
|
}
|