DESKTOP-USV654P\pc před 1 rokem
rodič
revize
9c45736457

+ 8 - 2
src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -332,7 +332,7 @@ public class UserController {
         return R.ok(userService.updateById(user));
     }
 
-    @PutMapping("/bind-openid")
+    @PostMapping("/bind-openid")
     @ApiOperation(value = "绑定微信")
     public  R bindOpenid(@RequestBody BindOpenidDto dto) {
         User user = userService.getOne(Wrappers.<User>query().lambda().select(User::getId, User::getOpenId).eq(User::getId, dto.getId()), false);
@@ -348,7 +348,7 @@ public class UserController {
         return R.error("该用户不存在!");
     }
 
-    @PutMapping("/unbind-openid")
+    @PostMapping("/unbind-openid")
     @ApiOperation(value = "取消绑定微信")
     public  R unbindOpenid(@RequestBody Long id) {
         User updateUser = new User();
@@ -356,4 +356,10 @@ public class UserController {
         updateUser.setOpenId("");
         return R.ok(userService.updateById(updateUser));
     }
+
+    @PostMapping("/register")
+    @ApiOperation(value = "注册")
+    public R register(@Valid @RequestBody AddUserDto dto) {
+        return R.ok(userService.add(dto));
+    }
 }

+ 5 - 4
src/main/java/com/xjrsoft/module/system/service/impl/LoginServiceImpl.java

@@ -202,12 +202,13 @@ public class LoginServiceImpl implements ILoginService {
                 tokenSession.set(GlobalConstant.LOGIN_USER_DEPT_INFO_KEY, department);
                 loginUser.setDepartmentId(department.getId());
             } else {
+                if (departmentList.size() > 0) {
+                    Department department = departmentList.get(0);
 
-                Department department = departmentList.get(0);
+                    tokenSession.set(GlobalConstant.LOGIN_USER_DEPT_INFO_KEY, department);
 
-                tokenSession.set(GlobalConstant.LOGIN_USER_DEPT_INFO_KEY, department);
-
-                loginUser.setDepartmentId(department.getId());
+                    loginUser.setDepartmentId(department.getId());
+                }
             }
 
         }

+ 1 - 0
src/main/resources/application-dev.yml

@@ -73,6 +73,7 @@ xjrsoft:
       - /${magic-api.prefix}/** # magic-api 前缀
       - /bi/project/info # 桌面
       - /system/loginByCode #编号登录
+      - /organization/user/register # 注册
   email:
     host:  #邮件服务器的SMTP地址,可选,默认为smtp.<发件人邮箱后缀>
     port:  # 邮件服务器的SMTP端口,可选,默认25