Commit 7aa084e3 authored by fangxinjiang's avatar fangxinjiang

ldap 登录 兼容处理

parent 8d64e01e
...@@ -121,6 +121,7 @@ public class BusinessUserController { ...@@ -121,6 +121,7 @@ public class BusinessUserController {
user.setDelFlag(CommonConstants.ZERO_STRING); user.setDelFlag(CommonConstants.ZERO_STRING);
user.setCreateTime(LocalDateTime.now()); user.setCreateTime(LocalDateTime.now());
user.setDeptName("客户单位"); user.setDeptName("客户单位");
user.setType(CommonConstants.TWO_STRING);
//使用根节点 //使用根节点
user.setDeptId(CommonConstants.HR_B_ORG_ID); user.setDeptId(CommonConstants.HR_B_ORG_ID);
if (Common.isNotNull(user.getPassword())){ if (Common.isNotNull(user.getPassword())){
......
...@@ -179,6 +179,7 @@ public class UserController { ...@@ -179,6 +179,7 @@ public class UserController {
@PostMapping @PostMapping
@PreAuthorize("@pms.hasPermission('sys_user_add')") @PreAuthorize("@pms.hasPermission('sys_user_add')")
public R<Boolean> user(@RequestBody UserDTO userDto) { public R<Boolean> user(@RequestBody UserDTO userDto) {
userDto.setType(CommonConstants.ZERO_STRING);
return R.ok(userService.saveUser(userDto)); return R.ok(userService.saveUser(userDto));
} }
...@@ -192,6 +193,7 @@ public class UserController { ...@@ -192,6 +193,7 @@ public class UserController {
@PutMapping @PutMapping
@PreAuthorize("@pms.hasPermission('sys_user_edit')") @PreAuthorize("@pms.hasPermission('sys_user_edit')")
public R<Boolean> updateUser(@Valid @RequestBody UserDTO userDto) { public R<Boolean> updateUser(@Valid @RequestBody UserDTO userDto) {
userDto.setType(CommonConstants.ZERO_STRING);
return R.ok(userService.updateUser(userDto)); return R.ok(userService.updateUser(userDto));
} }
......
...@@ -635,6 +635,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl ...@@ -635,6 +635,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
user.setUpdateTime(LocalDateTime.now()); user.setUpdateTime(LocalDateTime.now());
user.setUpdateBy("C端"); user.setUpdateBy("C端");
} }
user.setType(CommonConstants.THREE_STRING);
user.setWxOpenid(openId); user.setWxOpenid(openId);
return this.saveOrUpdate(user); return this.saveOrUpdate(user);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment