Merge remote-tracking branch 'origin/master'

jiangping

2025-03-05 d65e6f9c8cb7c9218801318f8cdd1a1e3a2f2408

 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);
    }
@@ -111,8 +112,12 @@
        return ApiResponse.success(systemUserService.findPage(pageWrap));
    }



    @ApiOperation("分页查询司机列表")
    @PostMapping("/pageDriver")
    @CloudRequiredPermission("system:user:query")
    public ApiResponse<PageData<SystemUser>> findDriverPage (@RequestBody PageWrap<SystemUser> pageWrap) {
        return ApiResponse.success(systemUserService.findDriverPage(pageWrap));
    }


    @ApiOperation("查询所有系统用户")
@@ -122,6 +127,12 @@
        return ApiResponse.success(systemUserService.findAllList(pageWrap));
    }

    @ApiOperation("查询所有内部人员用户")
    @PostMapping("/findInternalList")
    @CloudRequiredPermission("system:user:query")
    public ApiResponse<List<SystemUser>> findInternalList () {
        return ApiResponse.success(systemUserService.findInternalList());
    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")