Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

rk

4 天以前 8c4dfb07d551ceb372887ff8f22bd1f574d0347b

 server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java

@@ -6,9 +6,9 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.OperaType;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.CreateSystemUserDTO;
import com.doumee.dao.system.dto.CreateUserRoleDTO;
@@ -58,6 +58,7 @@
    @CloudRequiredPermission("system:user:resetPwd")
    public ApiResponse resetPwd (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated @RequestBody ResetSystemUserPwdDTO dto) {
        dto.setOperaUserId(this.getLoginUser(token).getId());
        dto.setNeedChangePwd(Constants.ZERO);
        systemUserBiz.resetPwd(dto);
        return ApiResponse.success(null);
    }
@@ -95,6 +96,16 @@
    }

    @Trace(withRequestParameters = false)
    @ApiOperation("修改是否禁用登录")
    @PostMapping("/updUserProhibitStatus")
    @CloudRequiredPermission("system:user:update")
    public ApiResponse updUserProhibitStatus(@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @RequestBody SystemUser systemUser) {
        systemUserBiz.updUserProhibitStatus(systemUser,this.getLoginUser(token));
        return ApiResponse.success(null);
    }


    @Trace(withRequestParameters = false)
    @ApiOperation("修改")
    @PostMapping("/updateById")
    @CloudRequiredPermission("system:user:update")