Merge remote-tracking branch 'origin/master'

jiangping

2024-06-11 fc38ef283d254bc4c6b700cfefcb0a6e65f19ba7

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java

@@ -6,6 +6,7 @@
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
@@ -96,6 +97,7 @@
    @PostMapping("/page")
    @CloudRequiredPermission("business:visits:query")
    public ApiResponse<PageData<Visits>> findPage (@RequestBody PageWrap<Visits> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        pageWrap.getModel().setMemberId(getLoginUser(token).getMemberId());
        return ApiResponse.success(visitsService.findPage(pageWrap));
    }

@@ -110,7 +112,8 @@
    @GetMapping("/{id}")
    @CloudRequiredPermission("business:visits:query")
    public ApiResponse<Visits> findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(visitsService.findById(id));
        LoginUserInfo loginUserInfo = getLoginUser(token);
        return ApiResponse.success(visitsService.findById(id,loginUserInfo.getMemberId()));
    }

    @ApiOperation("滞留人员")
@@ -126,7 +129,10 @@
    @ApiOperation(value = "访客报备", notes = "访客报备")
    @PostMapping("/createVisit")
    public ApiResponse createVisit(@RequestBody Visits visits,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        visits.setMemberId(getLoginUser(token).getMemberId());
        LoginUserInfo loginUserInfo = getLoginUser(token);
        visits.setMemberId(loginUserInfo.getMemberId());
        visits.setCreateMemberId(loginUserInfo.getMemberId());
        visits.setReceptMemberId(visits.getMemberId());
        return ApiResponse.success("查询成功", visitsService.visitReporting(visits));
    }