|
|
@@ -15,6 +15,7 @@ import com.tianhu.common.core.utils.DateUtils;
|
|
|
import com.tianhu.common.core.utils.IdUtils;
|
|
|
import com.tianhu.common.core.utils.SecurityUtils;
|
|
|
import com.tianhu.common.core.web.controller.BaseController;
|
|
|
+import com.tianhu.common.core.web.domain.AjaxResult;
|
|
|
import com.tianhu.common.log.annotation.Log;
|
|
|
import com.tianhu.common.log.enums.BusinessType;
|
|
|
import com.tianhu.common.redis.common.RedisUtils;
|
|
|
@@ -302,6 +303,7 @@ public class OwnCompanyManageController extends BaseController
|
|
|
|
|
|
LambdaQueryWrapper<SysUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
lambdaQueryWrapper.eq(SysUser::getUserName, userName);
|
|
|
+ lambdaQueryWrapper.eq(SysUser::getDelFlag,"0");
|
|
|
List<SysUser> users = iSysUserService.findSysUsers(lambdaQueryWrapper);
|
|
|
SysUser createUser = null;
|
|
|
// 用户没有注册
|
|
|
@@ -311,6 +313,8 @@ public class OwnCompanyManageController extends BaseController
|
|
|
sysUser.setNickName(nickName);
|
|
|
sysUser.setUserName(userName);
|
|
|
sysUser.setPassword(SecurityUtils.encryptPassword(password));
|
|
|
+ sysUser.setCreateTime(DateUtils.getNowDate());
|
|
|
+ sysUser.setCreateBy(userId);
|
|
|
iSysUserService.createSysUser(sysUser);
|
|
|
createUser = iSysUserService.findSysUsers(lambdaQueryWrapper).get(0);
|
|
|
// 已存在用户
|
|
|
@@ -917,6 +921,20 @@ public class OwnCompanyManageController extends BaseController
|
|
|
return R.ok();
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 根据手机号获取用户姓名
|
|
|
+ */
|
|
|
+ @GetMapping("selectNormalUser")
|
|
|
+ public AjaxResult selectNormalUser(String userName)
|
|
|
+ {
|
|
|
+ LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ if(CommonUtil.isNotEmpty(userName)) {
|
|
|
+ queryWrapper.eq(SysUser::getUserName,userName);
|
|
|
+ List<SysUser> list = iSysUserService.findSysUsers(queryWrapper);
|
|
|
+ return AjaxResult.success(list);
|
|
|
+ }
|
|
|
+ return AjaxResult.success();
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
* 更改为核心企业
|
sqg