最新版本541200007

jiangping

2024-10-21 c5a0ff2661fe362dddbe88c6a28d19c48c24c39b

最新版本541200007

 admin/src/views/meeting/userStatistics.vue

@@ -166,7 +166,7 @@
    userList({
      page: 1,
      capacity: 9999,
      model: { realname: this.filterText },
      model: { realname: this.filterText, companyType: 1 },
    })
      .then(res => {
        console.log('userList', res);

 server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java

@@ -98,6 +98,7 @@
    @PostMapping("/page")
    @CloudRequiredPermission("business:bookings:query")
    public ApiResponse<PageData<Bookings>> findPage (@RequestBody PageWrap<Bookings> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(bookingsService.findPage(pageWrap));
    }

@@ -105,6 +106,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:bookings:exportExcel")
    public void exportExcel (@RequestBody PageWrap<Bookings> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(Bookings.class).export(bookingsService.findPage(pageWrap).getRecords(), "会议室预定信息表", response);
    }


 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java

@@ -471,6 +471,26 @@
        queryWrapper.orderByDesc(Bookings::getCreateDate);
        queryWrapper.eq(Bookings::getIsdeleted, MeetConstants.ZERO);

        //数据权限开始--------------------start----------------
        LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
        if(userInfo!=null && userInfo.getCompanyIdList()!=null){
            if(  userInfo.getCompanyIdList().size() ==0){
                //只看自己
                queryWrapper.and(wrapper ->{
                    wrapper.eq(Bookings::getCreator,userInfo.getId())
                            .or().exists("select rel.id from meeting_user_rel rel where rel.OBJ_TYPE=0 and rel.obj_id=t.id and rel.isdeleted=0 and rel.user_id="+userInfo.getId());
                });
                queryWrapper.eq(Bookings::getCreator,userInfo.getId());
            }else{
                //权限范围内
                queryWrapper.and(wrapper ->{
                    wrapper.in(SystemUser::getCompanyId ,userInfo.getCompanyIdList())
                            .or().exists("select rel.id from meeting_user_rel rel where rel.OBJ_TYPE=0 and rel.obj_id=t.id and rel.isdeleted=0 and rel.user_id="+userInfo.getId());
                });
            }
        }
        //数据权限开始--------------------end----------------

        queryWrapper.eq(pageWrap.getModel().getRoomId() != null, Bookings::getRoomId, pageWrap.getModel().getRoomId());
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()), Bookings::getName, pageWrap.getModel().getName());
        queryWrapper.eq(pageWrap.getModel().getStatus() != null, Bookings::getStatus, pageWrap.getModel().getStatus());

 server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java

@@ -49,7 +49,7 @@
    @ApiModelProperty(value = "用户类型：0=司机 ， 2=内部人员" ,hidden = true)
    private Integer memberType;

    @ApiModelProperty(value = "用户类型：0=劳务；1=内部" ,hidden = true)
    @ApiModelProperty(value = "用户类型：0=相关方；1=内部" ,hidden = true)
    private Integer companyType;



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

@@ -71,6 +71,7 @@
    @PostMapping("/page")
    @CloudRequiredPermission("business:carusebook:query")
    public ApiResponse<PageData<CarUseBook>> findPage (@RequestBody PageWrap<CarUseBook> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(carUseBookService.findPage(pageWrap));
    }

@@ -78,6 +79,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:carusebook:exportExcel")
    public void exportExcel (@RequestBody PageWrap<CarUseBook> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(CarUseBook.class).export(carUseBookService.findPage(pageWrap).getRecords(), "车辆_用车申请信息表", response);
    }


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

@@ -83,6 +83,7 @@
    @PostMapping("/page")
    @CloudRequiredPermission("business:cars:query")
    public ApiResponse<PageData<Cars>> findPage (@RequestBody PageWrap<Cars> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(carsService.findPage(pageWrap));
    }

@@ -91,6 +92,7 @@
    @PostMapping("/list")
    @CloudRequiredPermission("business:cars:query")
    public ApiResponse<List<Cars>> findList (@RequestBody Cars cars,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
       cars.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(carsService.findList(cars));
    }

@@ -98,6 +100,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:cars:exportExcel")
    public void exportExcel (@RequestBody PageWrap<Cars> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(Cars.class).export(carsService.findPage(pageWrap).getRecords(), "车辆信息表", response);
    }


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

@@ -71,6 +71,7 @@
    @PostMapping("/page")
    @CloudRequiredPermission("business:empower:query")
    public ApiResponse<PageData<Empower>> findPage (@RequestBody PageWrap<Empower> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(empowerService.findPage(pageWrap));
    }

@@ -78,6 +79,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:empower:exportExcel")
    public void exportExcel (@RequestBody PageWrap<Empower> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(Empower.class).export(empowerService.findPage(pageWrap).getRecords(), "授权记录", response);
    }


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

@@ -67,6 +67,7 @@
    @PostMapping("/page")
    @CloudRequiredPermission("business:hiddendanger:query")
    public ApiResponse<PageData<HiddenDanger>> findPage (@RequestBody PageWrap<HiddenDanger> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(hiddenDangerService.findPage(pageWrap));
    }

@@ -74,6 +75,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:hiddendanger:exportExcel")
    public void exportExcel (@RequestBody PageWrap<HiddenDanger> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(HiddenDanger.class).export(hiddenDangerService.findPage(pageWrap).getRecords(), "隐患信息表", response);
    }


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

@@ -293,6 +293,7 @@
        if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
            return ApiResponse.success(memberService.findVisitPage(pageWrap));
        }else if(pageWrap.getModel().getType().equals(Constants.memberType.internal)){
            pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
            return ApiResponse.success(memberService.findMemberInfoPage(pageWrap));
        }else {
            return ApiResponse.success(null);

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

@@ -90,6 +90,7 @@
    @PostMapping("/page")
    @CloudRequiredPermission("business:parkbook:query")
    public ApiResponse<PageData<ParkBook>> findPage (@RequestBody PageWrap<ParkBook> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(parkBookService.findPage(pageWrap));
    }

@@ -97,6 +98,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:parkbook:exportExcel")
    public void exportExcel (@RequestBody PageWrap<ParkBook> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(ParkBook.class).export(parkBookService.findPage(pageWrap).getRecords(), "车辆预约记录信息表", response);
    }


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

@@ -72,6 +72,7 @@
    @PostMapping("/page")
    @CloudRequiredPermission("business:visitor:query")
    public ApiResponse<PageData<Visitor>> findPage (@RequestBody PageWrap<Visitor> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(visitorService.findPage(pageWrap));
    }

@@ -79,6 +80,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:visitor:exportExcel")
    public void exportExcel (@RequestBody PageWrap<Visitor> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(Visitor.class).export(visitorService.findPage(pageWrap).getRecords(), "访客信息表", response);
    }


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

@@ -99,6 +99,7 @@
    @CloudRequiredPermission("business:visits:query")
    public ApiResponse<PageData<Visits>> findPage (@RequestBody PageWrap<Visits> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
//        pageWrap.getModel().setReceptMemberId(getLoginUser(token).getMemberId());
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(visitsService.findPage(pageWrap));
    }

@@ -106,6 +107,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:visits:exportExcel")
    public void exportExcel (@RequestBody PageWrap<Visits> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(Visits.class).export(visitsService.findPage(pageWrap).getRecords(), "访客申请信息表", response);
    }


 server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java

@@ -1,6 +1,7 @@
package com.doumee.dao.admin.request;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
@@ -14,7 +15,7 @@
 */
@Data
@ApiModel("人员查询 参数")
public class MemberQuery implements Serializable {
public class MemberQuery extends LoginUserModel implements Serializable {

    @ApiModelProperty(value = "姓名/手机号/工号")
    private String keyword;

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java

@@ -27,93 +27,100 @@

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ExcelColumn(name="主键")
//    @ExcelColumn(name="主键")
    private Integer id;

    @ApiModelProperty(value = "创建人编码", example = "1")
    @ExcelColumn(name="创建人编码")
//    @ExcelColumn(name="创建人编码")
    private Integer creator;

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
//    @ExcelColumn(name="创建时间")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
    @ExcelColumn(name="更新人编码")
//    @ExcelColumn(name="更新人编码")
    private Integer editor;

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
//    @ExcelColumn(name="更新时间")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
    @ExcelColumn(name="是否删除0否 1是")
//    @ExcelColumn(name="是否删除0否 1是")
    private Integer isdeleted;

    @ApiModelProperty(value = "备注")
    @ExcelColumn(name="备注")
//    @ExcelColumn(name="备注")
    private String remark;

    @ApiModelProperty(value = "隐患区域编码（关联hidden_danger_param)", example = "1")
    @ExcelColumn(name="隐患区域编码（关联hidden_danger_param)")
//    @ExcelColumn(name="隐患区域编码（关联hidden_danger_param)")
    private Integer areaId;

    @ApiModelProperty(value = "状态 0待处理 1已处理 2不处理", example = "1")
    @ExcelColumn(name="状态 0待处理 1已处理 2不处理")
    @ExcelColumn(name="处理结果" ,valueMapping ="0=0待处理;1=已处理;2=不处理;",index = 6)
    private Integer status;

    @ApiModelProperty(value = "申请处理人编码(关联member)", example = "1")
    @ExcelColumn(name="申请处理人编码(关联member)")
//    @ExcelColumn(name="申请处理人编码(关联member)")
    private Integer applyCheckUserId;

    @ApiModelProperty(value = "隐患类型编码（关联hidden_danger_param)", example = "1")
    @ExcelColumn(name="隐患类型编码（关联hidden_danger_param)")
//    @ExcelColumn(name="隐患类型编码（关联hidden_danger_param)")
    private Integer cateId;

    @ApiModelProperty(value = "情况说明")
    @ExcelColumn(name="情况说明")
//    @ExcelColumn(name="情况说明")
    private String content;

    @ApiModelProperty(value = "提报人编码（关联member）", example = "1")
    @ExcelColumn(name="提报人编码（关联member）")
//    @ExcelColumn(name="提报人编码（关联member）")
    private Integer memberId;

    @ApiModelProperty(value = "处理时间")
    @ExcelColumn(name="处理时间")
//    @ExcelColumn(name="处理时间")
    private Date checkDate;

    @ApiModelProperty(value = "处理说明")
    @ExcelColumn(name="处理说明")
//    @ExcelColumn(name="处理说明")
    private String checkInfo;

    @ApiModelProperty(value = "处理人编码（关联member)", example = "1")
    @ExcelColumn(name="处理人编码（关联member)")
//    @ExcelColumn(name="处理人编码（关联member)")
    private Integer checkUserId;

    @ApiModelProperty(value = "区域名称")
    @ExcelColumn(name="区域名称")
    @ExcelColumn(name="隐患区域",index = 1)
    private String areaName;

    @ApiModelProperty(value = "申请人姓名", example = "1")
    @TableField(exist = false)
    @ExcelColumn(name="提报人姓名",index = 3)
    private String memberName;
    @ApiModelProperty(value = "申请人所属组织名称", example = "1")
    @TableField(exist = false)
    @ExcelColumn(name="所属组织",index = 4)
    private String companyName;
    @ApiModelProperty(value = "申请人手机号", example = "1")
    @TableField(exist = false)
//    @ExcelColumn(name="申请人手机号")
    private String memberPhone;
    @ApiModelProperty(value = "处理人姓名", example = "1")
    @TableField(exist = false)
//    @ExcelColumn(name="处理人姓名")
    private String checkorName;
    @ApiModelProperty(value = "处理人所属组织名称", example = "1")
    @TableField(exist = false)
//    @ExcelColumn(name="处理人所属组织名称")
    private String checkorCompanyName;
    @ApiModelProperty(value = "处理人手机号", example = "1")
    @TableField(exist = false)
//    @ExcelColumn(name="处理人手机号")
    private String checkorPhone;
    @ApiModelProperty(value = "隐患类型名称", example = "1")
    @TableField(exist = false)
    @ExcelColumn(name="隐患类型",index = 2)
    private String categoryName;

    @ApiModelProperty(value = "查询开始时间（基于提报时间）", example = "2024-05-20 11:48:50")
@@ -134,10 +141,12 @@

    @ApiModelProperty(value = "提报时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ExcelColumn(name="提报时间",index = 5)
    private Date submitTime;

    @ApiModelProperty(value = "处理时间（整改/退回使用）")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ExcelColumn(name="处理时间",index = 7)
    private Date dealTime;

    @ApiModelProperty(value = "附件信息")

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java

@@ -1165,7 +1165,7 @@
                .last(" limit 1")
        );
        if(Objects.isNull(approve)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到审批数据");
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"申请已被他人审批");
        }
        if(!approve.getStatus().equals(Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"审批记录状态错误!");

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java

@@ -250,7 +250,18 @@
        queryWrapper.select("t4.company_name_path",CarUseBook::getCompanyName);
        queryWrapper.leftJoin(Member.class,Member::getId,CarUseBook::getMemberId)
                    .leftJoin(Member.class,Member::getId,CarUseBook::getDriverId)
                    .leftJoin("company t4 on t1.company_id=t4.id");
                    .leftJoin("company t4 on t1.company_id=t4.id");   //数据权限开始--------------------start----------------
        LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
        if(userInfo!=null && userInfo.getCompanyIdList()!=null){
            if( userInfo.getCompanyIdList().size() ==0){
                //只能看自己
                queryWrapper.eq(CarUseBook::getCreator,userInfo.getId());
            }else{
                queryWrapper.in("t1.company_id" ,userInfo.getCompanyIdList());
            }
        }
        //数据权限开始--------------------end----------------

        queryWrapper
                .eq(pageWrap.getModel().getId() != null, CarUseBook::getId, pageWrap.getModel().getId())
                .eq(pageWrap.getModel().getCreator() != null, CarUseBook::getCreator, pageWrap.getModel().getCreator())

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java

@@ -300,6 +300,18 @@
        queryWrapper.eq(pageWrap.getModel().getType()!=null,Cars::getType,pageWrap.getModel().getType());
        queryWrapper.eq(pageWrap.getModel().getAuthStatus()!=null,Cars::getAuthStatus,pageWrap.getModel().getAuthStatus());
        queryWrapper.orderByDesc(Cars::getCreateDate);
        //数据权限开始--------------------start----------------
        LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
        if(userInfo!=null && userInfo.getCompanyIdList()!=null){
            if(  userInfo.getCompanyIdList().size() ==0){
                //只能看自己(拜访人）
                queryWrapper.eq(Cars::getMemberId,userInfo.getMemberId());
            }else{
                queryWrapper.in(Cars::getGroupId ,userInfo.getCompanyIdList());
            }
        }
        //数据权限开始--------------------end----------------

        IPage<Cars> result = carJoinMapper.selectJoinPage(page, Cars.class,queryWrapper);
        if(result!=null && result.getRecords()!=null && result.getRecords().size()>0){
            List<String> codes = new ArrayList<>();

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java

@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
@@ -114,7 +115,15 @@
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Empower::getCreator);
        queryWrapper.leftJoin(Device.class,Device::getId,Empower::getDeviceId);

        LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
        if(userInfo!=null && userInfo.getCompanyIdList()!=null){
            if( userInfo.getCompanyIdList().size() ==0){
                //只能看自己
                queryWrapper.eq(Member::getId,userInfo.getMemberId());
            }else{
                queryWrapper.in(Company::getId,userInfo.getCompanyIdList());
            }
        }
        queryWrapper
               /* .eq(Empower::getIsdeleted, Constants.ZERO)*/
                .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java

@@ -8,6 +8,7 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
@@ -322,6 +323,19 @@
                .leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
                .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
                .leftJoin("company t4 on t1.company_id=t4.id");

        //数据权限开始--------------------start----------------
        LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();

        if(userInfo!=null && userInfo.getCompanyIdList()!=null){
            if(  userInfo.getCompanyIdList().size() ==0){
                //只能看自己
                queryWrapper.eq(HiddenDanger::getCreator,userInfo.getId());
            }else{
                queryWrapper.in("t1.company_id" ,userInfo.getCompanyIdList());
            }
        }
        //数据权限开始--------------------end----------------
        queryWrapper
                .eq(pageWrap.getModel().getId() != null, HiddenDanger::getId, pageWrap.getModel().getId())
                .eq(pageWrap.getModel().getCreator() != null, HiddenDanger::getCreator, pageWrap.getModel().getCreator())

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -1379,6 +1379,15 @@
        queryWrapper.selectAs(Position::getName,Member::getPositionName);
        queryWrapper.leftJoin(Position.class,Position::getId,Member::getPositionId);
        queryWrapper.eq(Member::getType,pageWrap.getModel().getType());
        LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
        if(userInfo!=null && userInfo.getCompanyIdList()!=null){
            if( userInfo.getCompanyIdList().size() ==0){
                //只能看自己
                queryWrapper.eq(Member::getId,userInfo.getMemberId());
            }else{
                queryWrapper.in(Company::getId,userInfo.getCompanyIdList());
            }
        }
//        queryWrapper.eq(Objects.nonNull(model.getCompanyId()),Member::getCompanyId,model.getCompanyId())
        queryWrapper.in(Objects.nonNull(pageWrap.getModel().getCompanyIds())&&pageWrap.getModel().getCompanyIds().size()>0,
                        Member::getCompanyId,pageWrap.getModel().getCompanyIds())
@@ -1733,6 +1742,7 @@
                .eq(StringUtils.isNotBlank(checkVisitedDTO.getName()),Member::getName,checkVisitedDTO.getName())
                .eq(Member::getIsdeleted,Constants.ZERO)
                .eq(Member::getStatus,Constants.ZERO)
                .eq(Member::getWorkStatus,Constants.ZERO)
                .eq(Member::getCanVisit,Constants.ONE)
                .eq(Member::getType,Constants.memberType.internal) 
        );

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java

@@ -254,7 +254,16 @@
        queryWrapper.leftJoin(Parks.class,Parks::getId,ParkBook::getParkId);
        queryWrapper.leftJoin(Member.class,Member::getId,ParkBook::getMemberId);
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);

        LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
        if(userInfo!=null && userInfo.getCompanyIdList()!=null){
            if( userInfo.getCompanyIdList().size() ==0){
                //只能看自己
                queryWrapper.eq(Member::getId,userInfo.getMemberId());
            }else{
                queryWrapper.in(Company::getId,userInfo.getCompanyIdList());
            }
        }
        //数据权限开始--------------------end----------------
        queryWrapper
//                .eq(ParkBook::getIsdeleted, Constants.ZERO)
          .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getPhone,pageWrap.getModel().getMemberName())

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java

@@ -1228,6 +1228,18 @@
        queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);

        //数据权限开始--------------------start----------------
        LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
        if(userInfo!=null && userInfo.getCompanyIdList()!=null){
            if(  userInfo.getCompanyIdList().size() ==0){
                //只能看自己(拜访人）
                queryWrapper.eq(Member::getId,userInfo.getMemberId());
            }else{
                queryWrapper.in(Company::getId ,userInfo.getCompanyIdList());
            }
        }
        //数据权限开始--------------------end----------------

        queryWrapper.eq(Visits::getIsdeleted,Constants.ZERO);
        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType())&&Constants.equalsInteger(pageWrap.getModel().getType(),Constants.TWO),Visits::getType,pageWrap.getModel().getType());
        queryWrapper.ne(Objects.nonNull(pageWrap.getModel().getType())&&!Constants.equalsInteger(pageWrap.getModel().getType(),Constants.TWO),Visits::getType,Constants.TWO);