youhua

cif-service/src/main/java/com/txz/cif/web/UserApiController.java

@@ -172,7 +172,8 @@ public class UserApiController extends AbstractApiController {
 
     @ApiOperation(value = "更新用户", notes = "",httpMethod = "POST")
     @PostMapping("/updateUser")
-    public Result<UserInfoBO> updateUser(@RequestBody UserInfoForm userForm, @RequestHeader(value = X_CLIENT_TOKEN_USERID,required = false) Long userId) {
+    public Result<UserInfoBO> updateUser(@RequestBody UserInfoForm userForm,HttpServletRequest request) {
+        Long userId = authService.getTokenUserId(request);
         if (userForm.getUserId() == null){
             return ResultGenerator.genFailResult(ResultCode.USERID_IS_NULL);
         }
@@ -284,7 +285,8 @@ public class UserApiController extends AbstractApiController {
 
     @PostMapping("/myUsers")
     @ApiOperation(value = "获取我的邀请的用户",httpMethod = "POST")
-    public Result<List<User>> myUsers(@RequestBody MyUserParam param, HttpServletRequest request, @RequestHeader(value = X_CLIENT_TOKEN_USERID,required = false) Long userId) {
+    public Result<List<User>> myUsers(@RequestBody MyUserParam param, HttpServletRequest request) {
+        Long userId = authService.getTokenUserId(request);
         PageHelper.startPage(param.getPage(), param.getSize());
         Condition condition = new Condition(User.class);
         Example.Criteria criteria = condition.createCriteria();

cif-service/src/main/java/com/txz/cif/web/mng/UserController.java

@@ -82,7 +82,7 @@ public class UserController extends AbstractApiController {
 
     @PostMapping("/list")
     @ApiOperation(value = "获取用户",httpMethod = "POST")
-    public Result<List<UserBo2>> list(@RequestBody MyUserParam param, HttpServletRequest request, @RequestHeader(value = X_CLIENT_TOKEN_USERID,required = false) Long userId) {
+    public Result<List<UserBo2>> list(@RequestBody MyUserParam param, HttpServletRequest request) {
         PageHelper.startPage(param.getPage(), param.getSize());
         Condition condition = new Condition(User.class);
         Example.Criteria criteria = condition.createCriteria();
@@ -91,11 +91,11 @@ public class UserController extends AbstractApiController {
             param.setType(0);
         }
         if (param.getType() == 1){
-            criteria.andEqualTo("pid",userId);
-            criteria2.andEqualTo("pid",userId);
+            criteria.andEqualTo("pid",param.getUserId());
+            criteria2.andEqualTo("pid",param.getUserId());
         } else if (param.getType() == 2){
-            criteria.andEqualTo("ppid",userId);
-            criteria2.andEqualTo("ppid",userId);
+            criteria.andEqualTo("ppid",param.getUserId());
+            criteria2.andEqualTo("ppid",param.getUserId());
         }
         if (param.getStatus() != null){
             criteria.andEqualTo("status",param.getStatus());

cif-service/src/main/java/com/txz/cif/web/para/MyUserParam.java

@@ -11,6 +11,9 @@ public class MyUserParam {
     @ApiModelProperty("第几页")
     private Integer page;
 
+    @ApiModelProperty("用户id")
+    private Long userId;
+
     @ApiModelProperty("每页显示条数")
     private Integer size;