Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-05-15 959edec9fe35807d6b1b794cce42e9665d50d3a8

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

@@ -1,10 +1,12 @@
package com.doumee.service.business.impl;

import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdcardUtil;
import cn.hutool.core.util.PhoneUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.DataSyncConfig;
import com.doumee.config.Jwt.JwtPayLoad;
@@ -22,16 +24,12 @@
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.HttpsUtil;
import com.doumee.core.utils.Utils;
import com.doumee.core.utils.*;
import com.doumee.core.utils.redis.RedisUtil;
import com.doumee.core.wx.WXConstant;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.admin.response.StagingDataVO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
@@ -40,8 +38,6 @@
import com.doumee.dao.business.join.UserActionJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemDepartment;
import com.doumee.dao.system.model.SystemDepartmentUser;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.web.reqeust.AccountLoginDTO;
@@ -50,10 +46,6 @@
import com.doumee.dao.web.response.MemberVO;
import com.doumee.dao.web.response.WxAuthorizeVO;
import com.doumee.service.business.MemberService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl;
import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -67,6 +59,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Date;
import java.util.*;
import java.util.stream.Collectors;

@@ -135,18 +128,21 @@
        //脱敏操作
        Member insert = initAddMemberModel(member,loginUserInfo);
        //海康人员新增业务
        if(dealHkUserBiz(insert)){
            try {
        try {
             if(dealHkUserBiz(insert)){
                memberMapper.insert(insert);
                //创建系统登陆账号（默认无任何角色）
                createSystemUser(insert);
            }catch (Exception e){
                //如果发生异常，删除已经创建的人员信息
                deleteHkUserBiz(insert.getHkId());
                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息新建失败，请稍后重试！");
                if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
                    //如果是内部组织人员，新增系统登陆账号
                    createSystemUser(insert);
                }
            }else{
                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息同步安防平台失败，请稍后重试！");
            }
        }else{
            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息同步安防平台失败，请稍后重试！");
        }catch (Exception e){
            //如果发生异常，删除已经创建的人员信息
            deleteHkUserBiz(insert.getHkId());
            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息新建失败，请稍后重试！");
        }
        return insert;
    }
@@ -157,7 +153,6 @@
        // 生成密码
        user.setPassword(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INITIAL_PASSWORD).getCode(), salt));
        user.setSalt(salt);

        // 创建用户记录
        user.setType(insert.getType());
        user.setUsername(insert.getPhone());
@@ -182,6 +177,7 @@
        insert.setCreateDate(new Date());
        insert.setEditor(loginUserInfo.getId());
        insert.setEditDate(new Date());
        insert.setHkOrgId(member.getHkOrgId());
        insert.setIsdeleted(Constants.ZERO);
        insert.setCompanyId(member.getCompanyId());
        insert.setFaceImg(member.getFaceImg());
@@ -189,10 +185,13 @@
        insert.setCode(member.getCode());
        insert.setType(Constants.TWO);
        insert.setHkDate(new Date());
        insert.setWorkStatus(Constants.ONE);//默认在职
        insert.setCanVisit(Constants.ZERO);//默认不可访问
        insert.setAuthStatus(Constants.ZERO);
        insert.setName(member.getName());
        insert.setHkStatus(Constants.ONE);
        insert.setSex(IdcardUtil.getGenderByIdCard(member.getIdcardNo()) ==1?Constants.TWO:Constants.ONE);//根据身份证号获取性别
        insert.setBirthday( DateUtil.parse(IdcardUtil.getBirthByIdCard(member.getIdcardNo()), "yyyyMMdd"));
        insert.setSex(Constants.getSexByCardNo( member.getIdcardNo()));//根据身份证号获取性别
        insert.setBirthday( DateUtil.fromStringToDate("yyyyMMdd",IdcardUtil.getBirthByIdCard(member.getIdcardNo())));
        insert.setPhone(member.getPhone());
        insert.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()));//身份证号加密
        insert.setIdcardDecode( Constants.getTuominStr(member.getIdcardNo()));
@@ -205,6 +204,9 @@
     * @param hkId
     */
    private void deleteHkUserBiz(String hkId) {
        if(StringUtils.isBlank(hkId)){
            return;
        }
        UserDelRequest request = new UserDelRequest();
        request.setPersonIds(new String[]{hkId});
        BaseResponse<List<UserDelResponse>> result =  HKService.delBatchUser(request);
@@ -218,14 +220,6 @@
    private boolean dealHkUserBiz(Member insert) {
        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
                +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
        Company company = companyMapper.selectById(insert.getCompanyId());
        if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该组织信息已被删除，请刷新页面重试！");
        }
        if(StringUtils.isBlank(company.getHkId())){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该组织信息未同步安防平台，请先前往【组织管理】菜单进行维护！");
        }
        insert.setHkOrgId(company.getHkId());
        UserAddRequest hkAddRequest = HkSyncOrgUserToHKServiceImpl.getUserAddModel(insert,path,Constants.ZERO);
        if(hkAddRequest == null){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，人脸照片有误，请尝试重新上传！");
@@ -246,33 +240,192 @@
        }
        return false;
    }
    private boolean dealHkUserForUpdateBiz(Member update ) {
        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
                +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();

        UserAddRequest hkAddRequest = HkSyncOrgUserToHKServiceImpl.getUserAddModel(update,path,Constants.ONE);

        //处理新增数据
        BaseResponse<UserAddResponse> result =  HKService.editUser(hkAddRequest);
        if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) ){
            update.setHkStatus(Constants.ONE);//已同步
            update.setRemark("人员信息已同步成功");
            if(StringUtils.isNotBlank(update.getFaceImg()) && Constants.equalsInteger(update.getFaceStatus(),Constants.ZERO)){
                //如果有人脸照片，处理人脸照片同步
                String faceid = HkSyncOrgUserToHKServiceImpl.dealMemberFace(update,path);
                if(StringUtils.isBlank(faceid)){
                    throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，员工人脸信息不合格，请更换人脸照片重试！");
                }else{
                    update.setFaceId(faceid);
                    update.setFaceStatus(Constants.ONE);
                    //如果人脸跟你，重新下发权限数据
                    update.setRemark("人员和人脸信息同步成功"+result.getMsg());
                    //重新授权设备权限
//                    HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(null,update,deviceRoleMapper,empowerMapper,deviceMapper);
                }
            }
            update.setHkDate(update.getEditDate());
            return  true;
        }else  if(result!=null ){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，同步安防平台失败【"+result.getMsg()+"】，请联系管理员！");
        }
        return false;
    }

    /**
     * 清除员工的设备权限
     * @param member
     */
    private void cancelAllMemberEmpower(Member member) {
        //删除全部权限
        memberRoleMapper.update(null,new UpdateWrapper<MemberRole>().lambda()
                .eq(MemberRole::getMemberId,member.getId())
                .set(MemberRole::getIsdeleted,Constants.ONE)
                .set(MemberRole::getEdirot,member.getEditor())
                .set(MemberRole::getEditDate,member.getEditDate()));
        //把所有待下发的任务改成 已取消
        empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
                .eq(Empower::getMemberId,member.getId())
                .eq(Empower::getIsdeleted,Constants.ZERO)
                .eq(Empower::getSendStatus,Constants.EmpowerStatus.wait)
                .set(Empower::getIsdeleted,Constants.ONE)
                .set(Empower::getSendStatus,Constants.EmpowerStatus.cancel));
        //所有下发过的任务，改为待删除权限
        empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
                .eq(Empower::getMemberId,member.getId())
                .set(Empower::getIsdeleted,Constants.ONE)
                .notIn(Empower::getSendStatus,Constants.EmpowerStatus.fail)
                .set(Empower::getRemark,"等待同步删除安防平台")
                .eq(Empower::getIsdeleted,Constants.ZERO)
                .eq(Empower::getIsdeleted,Constants.ZERO)
                .set(Empower::getSendStatus,Constants.ZERO));
    }

    private void isMemberParamValid(Member member) {
        if (!PhoneUtil.isPhone(member.getPhone())){
        if(member.getCompanyId() == null){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        if (StringUtils.isBlank(member.getPhone())||!PhoneUtil.isPhone(member.getPhone())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"电话号码格式有误");
        }
        if (!IdcardUtil.isValidCard(member.getIdcardNo())){
        if (StringUtils.isBlank(member.getIdcardNo())||!IdcardUtil.isValidCard(member.getIdcardNo())){
            if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
                    .eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()))
                    .eq(Member::getIsdeleted,Constants.ZERO)
                    .ne(Member::getId,member.getId())) >0){
                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "身份证号【"+member.getIdcardNo()+"】已被使用，不能重复");
            }
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"身份证号格式有误");
        }

        SystemUser systemUser = new SystemUser();
        SystemUser queryUserDto = new SystemUser();
        queryUserDto.setUsername(member.getPhone());
        queryUserDto.setDeleted(Boolean.FALSE);
        SystemUser user = systemUserMapper.selectOne(new QueryWrapper<>(queryUserDto).last("limit 1"));
        if (user != null) {
            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "手机号【"+systemUser.getUsername()+"】已被使用，不能重复");
        Company company = companyMapper.selectById(member.getCompanyId());
        if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该组织信息已被删除，请刷新页面重试！");
        }
        // 验证工号
        if (StringUtils.isNotBlank(member.getCode())) {
        if(StringUtils.isBlank(company.getHkId())){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该组织信息未同步安防平台，请先前往【组织管理】菜单进行维护！");
        }
        member.setHkOrgId(company.getHkId());
        member.setCompanyType(company.getType());
        if(Constants.equalsInteger(company.getType(),Constants.ONE)){
            SystemUser queryUserDto = new SystemUser();
            queryUserDto.setUsername(member.getPhone());
            queryUserDto.setDeleted(Boolean.FALSE);
            SystemUser user = systemUserMapper.selectOne(new QueryWrapper<>(queryUserDto).last("limit 1"));
            if (user != null) {
                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "手机号【"+queryUserDto.getUsername()+"】已被使用，不能重复");
            }
            // 验证工号
            if (StringUtils.isNotBlank(member.getCode())) {
                queryUserDto = new SystemUser();
                queryUserDto.setDeleted(Boolean.FALSE);
                queryUserDto.setEmpNo(member.getCode());
                user = systemUserMapper.selectOne(new QueryWrapper<>(queryUserDto).last("limit 1"));
                if (user != null) {
                    throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "工号【"+member.getCode()+"】已存在");
                }
            }
        }
    }
    private Member isMemberUpdateParamValid(Member member) {
        Member model = memberMapper.selectById(member.getId());
        if(model ==null ||Constants.equalsInteger(member.getIsdeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，该员工信息不存在，请刷新页面重试！");
        }
        if (StringUtils.isNotBlank(member.getPhone()) && !PhoneUtil.isPhone(member.getPhone())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"电话号码格式有误");
        }
        if (StringUtils.isNotBlank(member.getIdcardNoNew())){
            String encrptNo = (DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNoNew()));//身份证号加密
            if(  !StringUtils.equals(model.getIdcardNo(),encrptNo)&& !IdcardUtil.isValidCard(member.getIdcardNoNew())){
                //如果发生改变，并且不合法，提示异常
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"修改的新身份证号格式有误");
            }
            if( !StringUtils.equals(model.getIdcardNo(),encrptNo) ){
                if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
                        .eq(Member::getIdcardNo,encrptNo)
                        .eq(Member::getIsdeleted,Constants.ZERO)
                        .ne(Member::getId,member.getId())) >0){
                    throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "身份证号【"+member.getIdcardNoNew()+"】已被使用，不能重复");
                }

                member.setSex(Constants.getSexByCardNo( member.getIdcardNoNew()));//根据身份证号获取性别
                member.setIdcardDecode( Constants.getTuominStr(member.getIdcardNoNew()));
                member.setIdcardNo(encrptNo);
            }
        }
        boolean isNeedUpdateUser = false;
        if(StringUtils.isNotBlank(member.getPhone()) && StringUtils.equals(member.getPhone(),model.getPhone())){
            //  如果手机号发生修改，校验唯一性
            SystemUser queryUserDto = new SystemUser();
            queryUserDto.setUsername(member.getPhone());
            queryUserDto.setDeleted(Boolean.FALSE);
            SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>(queryUserDto).lambda()
                    .ne(SystemUser::getMemberId,model.getId()).last("limit 1"));
            if (user != null) {
                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "手机号【" + queryUserDto.getUsername() + "】已被使用，不能重复");
            }
            isNeedUpdateUser = true;
        }
        if(StringUtils.isNotBlank(member.getCode()) && StringUtils.equals(member.getPhone(),model.getCode())){
                // 验证工号
            SystemUser queryUserDto = new SystemUser();
            queryUserDto = new SystemUser();
            queryUserDto.setDeleted(Boolean.FALSE);
            queryUserDto.setEmpNo(member.getCode());
            user = systemUserMapper.selectOne(new QueryWrapper<>(queryUserDto).last("limit 1"));
            SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>(queryUserDto).lambda()
                    .ne(SystemUser::getMemberId,model.getId()).last("limit 1"));
            if (user != null) {
                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "工号【"+member.getCode()+"】已存在");
            }
            isNeedUpdateUser = true;
        }
        if(member.getCompanyId()!=null && !Constants.equalsInteger(member.getCompanyId(),model.getCompanyId())){
            //如果组织发生变化
            Company company = companyMapper.selectById(member.getCompanyId());
            if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该组织信息已被删除，请刷新页面重试！");
            }
            if(StringUtils.isBlank(company.getHkId())){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该组织信息未同步安防平台，请先前往【组织管理】菜单进行维护！");
            }
            member.setHkOrgId(company.getHkId());
            isNeedUpdateUser = true;
        }
        if(isNeedUpdateUser){
            //更新系统用户账号信息
            systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
                            .set(SystemUser::getUpdateUser,member.getLoginUserInfo().getId())
                            .set(SystemUser::getUpdateTime,new Date())
                            .set(StringUtils.isNotBlank(model.getPhone()),SystemUser::getMobile,member.getPhone())
                            .set(StringUtils.isNotBlank(model.getName()),SystemUser::getRealname,member.getName())
                            .set(model.getCompanyId() !=null,SystemUser::getCompanyId,member.getCompanyId())
                            .set(StringUtils.isNotBlank(model.getCode()),SystemUser::getEmpNo,member.getCode())
                    .eq(SystemUser::getMemberId,model.getId()));
        }
        member.setHkId(model.getHkId());
        member.setFaceId(model.getFaceId());//人脸编码
        return model;
    }

    @Transactional
@@ -293,8 +446,6 @@
        //脱敏操作
        String hide = IdcardUtil.hide(member.getIdcardNo(), 5, 14);
        //转换日期
        DateTime yyyyMMdd = DateUtil.parse(birthByIdCard, "yyyyMMdd");

        Member insert = new Member();
        insert.setCreator(loginUserInfo.getId());
        insert.setCreateDate(new Date());
@@ -306,7 +457,7 @@
        insert.setImgurl(member.getImgurl());
        insert.setType(Constants.ZERO);
        insert.setName(member.getName());
        insert.setBirthday(yyyyMMdd);
        insert.setBirthday(DateUtil.fromStringToDate("yyyyMMdd",birthByIdCard));
        insert.setPhone(member.getPhone());
        insert.setIdcardNo(Utils.Secure.encryptString(member.getIdcardNo()));
        IdcardUtil.isValidCard(member.getIdcardNo());
@@ -331,7 +482,7 @@
    }

    @Override
    public void deleteById(Integer id) {
    public void deleteById(Integer id,LoginUserInfo user) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

        Member member=new Member();
@@ -339,12 +490,15 @@
        member.setIsdeleted(Constants.ZERO);
        member.setEditor(loginUserInfo.getId());
        member.setEditDate(new Date());
        member.setHkStatus(Constants.ZERO);
        member.setRemark("人员已删除，等待删除门禁权限");
        memberMapper.updateById(member);
        saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper);
    }


    @Override
    public void roleAuthById(Integer id) {
    public void roleAuthById(Integer id,LoginUserInfo user) {
        Member member = memberMapper.selectById(id);
        if(member==null || member.getIsdeleted().equals(Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"员工信息已删除");
@@ -352,6 +506,157 @@
//        List<MemberCard> cards = HkSyncOrgUserToHKServiceImpl.getNormalCardList(member,memberCardMapper);
        HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(null,member,deviceRoleMapper,empowerMapper,deviceMapper);
    }
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void batchRoleAuth(Member memberRole) {
        if(memberRole.getIds() ==null
                || memberRole.getIds().size() ==0 ){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        if(memberRole.getRoleIds() ==null || memberRole.getRoleIds().length ==0){
            //如果是清空权限
        }else{
            if( ! (Constants.equalsObject(memberRole.getTimeType(),Constants.ZERO)
                    || (Constants.equalsObject(memberRole.getTimeType(),Constants.ONE)
                    && memberRole.getStartTime() !=null && memberRole.getEndTime() != null ))){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST);
            }
            if(Constants.equalsObject(memberRole.getTimeType(),Constants.ONE) && memberRole.getEndTime().getTime() < System.currentTimeMillis()){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"有效期截止日期不能小于当前时间！");
            }
            if(Constants.equalsObject(memberRole.getTimeType(),Constants.ONE) && memberRole.getEndTime().getTime() <= memberRole.getStartTime().getTime()){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"有效期截止日期不能小于开始时间！");
            }
        }
        if(Constants.equalsObject(memberRole.getTimeType(),Constants.ZERO) ){
           memberRole.setStartTime(null);
           memberRole.setEndTime(null);
        }
        for (Integer id : memberRole.getIds()){
            Member member = memberMapper.selectById(id);
            if(member==null || member.getIsdeleted().equals(Constants.ONE)){
                //如果员工信息不合法直接跳过
               continue;
            }
            member.setStartTime(memberRole.getStartTime());
            member.setEndTime(memberRole.getEndTime());
            Integer ischange = getRoleIdByParam(memberRole.getRoleIds(),member,memberRoleMapper,deviceRoleMapper);
            if(ischange == 0){
                return;//未发现权限变化，直接返回
            }
            if(memberRole.getRoleIds()!=null && memberRole.getRoleIds().length>0 && StringUtils.isBlank(member.getRoleId())){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，未查询到有效门禁组数据");
            }
            memberMapper.update(null,new UpdateWrapper<Member>().lambda()
                    .eq(Member::getId,member.getId())
                    .set(Member::getRoleId,member.getRoleId())
                    .set(Member::getAuthStatus,Constants.ONE)
                    .set(Member::getStartTime,memberRole.getStartTime())
                    .set(Member::getEndTime,memberRole.getEndTime())
                    .set(Member::getEditor,memberRole.getLoginUserInfo().getId())
                    .set(Member::getEditDate,new Date()) );
            saveUserActionBiz(member,memberRole.getLoginUserInfo(), Constants.UserActionType.AUTH_ROLE,userActionJoinMapper);
            //重新授权
            HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(null,member,deviceRoleMapper,empowerMapper,deviceMapper);
         }
    }

    public static   Integer   getRoleIdByParam(Integer[] param, Member member,MemberRoleMapper memberRoleMapper,DeviceRoleMapper deviceRoleMapper) {
        //添加人员角色关联数据
        member.setRoleId(null);
        List<MemberRole> roleList = memberRoleMapper.selectList( new QueryWrapper<MemberRole>().lambda()
                .eq(MemberRole::getIsdeleted,Constants.ZERO)
                .eq(MemberRole::getMemberId,member.getId()));

        member.setRoleId("");
        if((param == null || param.length==0 ) &&( roleList==null || roleList.size()==0)){
            //检查用户情况权限原本就是空的， 则无需处理
            return  0;
        }
         if((param == null || param.length==0 ) &&( roleList!=null && roleList.size()>0) ){
            //如果清空原来有权限，接口进行权限删除原有权限即可
            memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
            return 1;
        }
        if(!Objects.isNull(param)&&param.length>Constants.ZERO){
          /*     if(roleList!=null && roleList.size()>0) {
                //和原有权限进行对比，看是否权限发生变化
                boolean ischange1=false;
                for (MemberRole role : roleList) {
                    ischange1=false;
                    for (int j = 0; j < param.length; j++) {
                        if(Constants.equalsInteger(role.getRoleId(),param[j])){
                            ischange1=true;
                            break;
                        }
                    }
                    if(!ischange1){
                        break;
                    }
                }

                boolean ischange2 =false;
                for (int j = 0; j < param.length; j++) {
                    ischange2=false;
                    for (MemberRole role : roleList) {
                        if(Constants.equalsInteger(role.getRoleId(),param[j])){
                            ischange2=true;
                            break;
                        }
                    }
                    if(!ischange2){
                        break;
                    }
                }
                if(ischange2 && ischange1){
                    return 0;//权限未发生改变
                }
            }*/
            //如果原来有权限，接口进行权限删除
            memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
            //查询数据库存在的权限
            List<DeviceRole> deviceRoleList= deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
                    .eq(DeviceRole::getType,Constants.TWO)
                    .in(DeviceRole::getId,param));

            String ids = "";
            if(CollectionUtils.isNotEmpty(deviceRoleList)){
                List<MemberRole> memberRoleList = new ArrayList<>();
                List<Integer> r = new ArrayList<>();
                for (int i = 0; i < deviceRoleList.size(); i++) {
                    DeviceRole deviceRole =deviceRoleList.get(i);
                    if(i>0){
                        ids += ",";
                    }
                    Integer id =deviceRole.getId();
                    ids += "["+id+"]";
                    String doorids =deviceRole.getDoorIds();
                    if(StringUtils.isNotBlank(doorids)){
                        String[] ss = doorids.split(",");
                        try {
                            for(String s :ss){
                                r.add(Integer.parseInt(s));
                            }
                        }catch (Exception e){
                            //脏数据不处理
                        }
                    }
                    MemberRole memberRole = new MemberRole();
                    memberRole.setCreateDate(new Date());
                    memberRole.setMemberId(member.getId());
                    memberRole.setIsdeleted(Constants.ZERO);
                    memberRole.setRoleId(deviceRole.getId());
                    memberRoleList.add(memberRole);
                }
                memberRoleMapper.insertBatchSomeColumn(memberRoleList);
            }
            member.setRoleId(ids);
            return  1;
        }

        return  0;
    }

    @Override
    public     void empowerByList(Member member) {
        if(member.getIdList()!=null && member.getIdList().size() >0){
@@ -374,81 +679,152 @@
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void deleteByIdInBatch(List<Integer> ids,LoginUserInfo loginUserInfo) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Member member=new Member();
        ids.stream().forEach(s ->{
            member.setId(s);
            member.setIsdeleted(Constants.ONE);
            member.setHkStatus(Constants.ZERO);
            member.setRemark("人员已删除，等待删除门禁权限");
            member.setEditor(loginUserInfo.getId());
            member.setEditDate(new Date());
            memberMapper.updateById(member);

            UserAction userAction=new UserAction();
            userAction.setIsdeleted(Constants.ZERO);
            userAction.setCreateDate(new Date());
            userAction.setCreator(loginUserInfo.getId());
            userAction.setType(9);
            userAction.setRemark("由【"+loginUserInfo.getUsername()+"】于【操作时间"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"】，进行【删除】");
            userAction.setMemberId(s+"");
            userActionJoinMapper.insert(userAction);

            saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper);
        });





      /*  memberMapper.deleteBatchIds(ids);*/
    }

    /**
     * 拉黑或者冻结员工信息
     * @param ids
     * @param type
     * @param loginUserInfo
     */
    @Override
    public void batchBlock(List<Integer> ids,Integer type) {
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void batchBlock(List<Integer> ids,Integer type,LoginUserInfo loginUserInfo) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Member member=new Member();
        for (Integer id:ids) {
            member = memberMapper.selectById(id);
            Member member = memberMapper.selectById(id);
            if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){
                UserAction userAction=new UserAction();
//                userAction.setBeforeStatus(member.getStatus());
                member.setStatus(Constants.TWO);
                member.setEditor(loginUserInfo.getId());
                member.setEditDate(new Date());
                member.setAuthStatus(Constants.ZERO);//未授权
                memberMapper.updateById(member);
                Date date = new Date();
                member.setEditDate(date);
                member.setEditor(loginUserInfo.getId());
                //删除员工门禁权限
                cancelAllMemberEmpower(member);

                userAction.setIsdeleted(Constants.ZERO);
                userAction.setCreateDate(new Date());
                userAction.setCreator(loginUserInfo.getId());
                if(Constants.equalsInteger(type,Constants.ONE)){
                    userAction.setType(Constants.ONE);
                    userAction.setRemark("由【"+loginUserInfo.getUsername()+"】于【操作时间"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"】，进行【冻结】");
                    saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.FREEZE,userActionJoinMapper);
                }
                if(Constants.equalsInteger(type,Constants.TWO)){
                    userAction.setType(Constants.TWO);
                    userAction.setRemark("由【"+loginUserInfo.getUsername()+"】于【操作时间"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"】，进行【拉黑】");

                    saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.BLACKLIST,userActionJoinMapper);
                }
                userAction.setMemberId(id+"");

                userActionJoinMapper.insert(userAction);
            }
        }
        /*  memberMapper.deleteBatchIds(ids);*/
    }
    /**
     * 拉黑或者冻结员工信息
     * @param ids
     * @param type
     * @param loginUserInfo
     */
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void batchRemoveBlock(List<Integer> ids,Integer type,LoginUserInfo loginUserInfo) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        for (Integer id:ids) {
            Member member = memberMapper.selectById(id);
            if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){
                member.setStatus(Constants.ONE);//恢复正常状态
                member.setEditor(loginUserInfo.getId());
                member.setEditDate(new Date());
                member.setAuthStatus(Constants.ZERO);//未授权
                memberMapper.updateById(member);
                Date date = new Date();
                member.setEditDate(date);
                member.setEditor(loginUserInfo.getId());
                if(Constants.equalsInteger(type,Constants.ONE)){
                    saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.CANCEL_FREEZE,userActionJoinMapper);
                }
                if(Constants.equalsInteger(type,Constants.TWO)){
                    saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.CANCEL_BLACKLIST,userActionJoinMapper);
                }
            }
        }
    }




    @Override
    public void updateById(Member member) {
        memberMapper.updateById(member);
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void updateById(Member updateMember) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(loginUserInfo == null){
            loginUserInfo = updateMember.getLoginUserInfo();
        }
        //校验参数 并且更新systemuser 手机号和工号信息（如果需要修改的话）
         Member model =   isMemberUpdateParamValid(updateMember);
        updateMember.setEditor(loginUserInfo.getId());
        updateMember.setEditDate(new Date());
        //海康人员新增业务
        if(dealHkUserForUpdateBiz(updateMember)){
            updateMember.setHkId(null);
            updateMember.setAuthStatus(Constants.ZERO);
            memberMapper.update(null,new UpdateWrapper<Member>().lambda()
                    .set(Member::getStartTime,null)
                    .set(Member::getEndTime,null)
                    .set(StringUtils.isNotBlank(updateMember.getPhone()),Member::getPhone,updateMember.getPhone())
                    .set(StringUtils.isNotBlank(updateMember.getName()),Member::getName,updateMember.getName())
                    .set(Member::getEditDate,updateMember.getEditDate())
                    .set(Member::getEditor,updateMember.getEditor())
                    .set(StringUtils.isNotBlank(updateMember.getIdcardNo()),Member::getIdcardNo,updateMember.getIdcardNo())
                    .set(StringUtils.isNotBlank(updateMember.getIdcardDecode()),Member::getIdcardDecode,updateMember.getIdcardDecode())
                    .set(updateMember.getAuthStatus()!=null,Member::getAuthStatus,updateMember.getAuthStatus())
                    .set(updateMember.getHkStatus()!=null,Member::getHkStatus,updateMember.getHkStatus())
                    .set(updateMember.getSex()!=null,Member::getSex,updateMember.getSex())
                    .set(updateMember.getFaceStatus()!=null,Member::getFaceStatus,updateMember.getFaceStatus())
                    .set(updateMember.getHkDate()!=null,Member::getHkDate,updateMember.getHkDate())
                    .set(StringUtils.isNotBlank(updateMember.getRemark()),Member::getRemark,updateMember.getRemark())
                    .set(StringUtils.isNotBlank(updateMember.getFaceImg()),Member::getFaceImg,updateMember.getFaceImg())
                    .set(updateMember.getFaceId()!=null,Member::getFaceId,updateMember.getFaceId())
                    .set(updateMember.getCompanyId()!=null,Member::getCompanyId,updateMember.getCompanyId())
                    .set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
                    .eq(Member::getId,updateMember.getId()));
            cancelAllMemberEmpower(updateMember);
            //记录操作日志
            saveUserActionBiz(updateMember,loginUserInfo,Constants.UserActionType.EDIT,userActionJoinMapper);
        }else{
            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息同步安防平台失败，请稍后重试！");
        }
    }

    private void saveUserActionBiz(Member updateMember,LoginUserInfo user, Constants.UserActionType type,UserActionJoinMapper userActionMapper) {
        UserAction userAction=new UserAction();
        userAction.setIsdeleted(Constants.ZERO);
        userAction.setCreateDate(updateMember.getEditDate());
        userAction.setCreator(updateMember.getEditor());
        userAction.setBeforeStatus(updateMember.getStatus());
        userAction.setType(type.getKey());
        String info = type.getInfo();
        userAction.setRemark(info.replace("${param1}",user!=null?user.getRealname():"").replace("${param2}", com.doumee.core.utils.DateUtil.getPlusTime2(updateMember.getEditDate())));
        userAction.setMemberId(updateMember.getId()+"");
        userActionMapper.insert(userAction);
    }

    @Override
    public boolean updateFace(Member member) {
        QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
@@ -489,95 +865,98 @@
       }
        HkSyncEmpowerServiceImpl.doHkDeleteUser(model.getId(),model.getHkId(),new Date(),memberMapper,memberCardMapper);
    }
    @Override
    public void updateHead(Member member) {
        Member model  =memberMapper.selectById(member.getId());
        if(model ==null) {
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，人员信息不存在！");
        }
       if(model.getCompanyId()!=null) {
           if(Constants.equalsObject(member.getHeadStatus(),Constants.ONE)){
               //如果是取消主管
               companyMapper.update(null,new UpdateWrapper<Company>().lambda()
                       .eq(Company::getId,model.getCompanyId())
                       .set(Company::getHeadId,member.getId()));
               //记录操作日志
               saveUserActionBiz(member,member.getLoginUserInfo(), Constants.UserActionType.BE_HEAD,userActionJoinMapper);
           }else{
               //如果是设为主管
               companyMapper.update(null,new UpdateWrapper<Company>().lambda()
                       .eq(Company::getId,model.getCompanyId())
                       .set(Company::getHeadId,null)
               );
               saveUserActionBiz(member,member.getLoginUserInfo(),Constants.UserActionType.NOT_HEAD,userActionJoinMapper);
           }
       }
    }

    @Override
    public void updateStatusById(Member member) {
        Member model  =memberMapper.selectById(member.getId());
        if(model ==null) {
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，人员信息不存在！");
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(loginUserInfo == null){
            loginUserInfo = member.getLoginUserInfo();
        }
        Member update = new Member();
        update.setEditDate(new Date());
        update.setEditor(loginUserInfo.getId());
        update.setStatus(member.getStatus());
        memberMapper.updateById(update);
    }


    @Override
    public void updateVisitsStatusById(Member member) {
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void updateWorkStatus(Member member) {
        Member model  =memberMapper.selectById(member.getId());
        if(model ==null) {
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，人员信息不存在！");
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Member result=memberMapper.selectById(member.getId());
        Integer status=result.getStatus();
        if(loginUserInfo == null){
            loginUserInfo = member.getLoginUserInfo();
        }
        Member update = new Member();
        update.setId(member.getId());
        update.setEditDate(new Date());
        update.setEditor(loginUserInfo.getId());
        update.setStatus(Constants.Status.FREEZE.getValue());
        update.setId(member.getId());
        update.setWorkStatus(Constants.equalsInteger(member.getWorkStatus(),Constants.ONE)?Constants.ONE:Constants.ZERO);
        if(Constants.equalsInteger(member.getWorkStatus(),Constants.ONE)){
            //如果是离职
            cancelAllMemberEmpower(update);
        }
        update.setAuthStatus(Constants.ZERO);
        memberMapper.updateById(update);

        UserAction userAction=new UserAction();
        userAction.setIsdeleted(Constants.ZERO);
        userAction.setCreateDate(new Date());
        userAction.setCreator(loginUserInfo.getId());
        if(Constants.equalsInteger(result.getType(),Constants.TWO)){
            userAction.setType(Constants.ONE);
            userAction.setRemark("由【"+loginUserInfo.getUsername()+"】于【操作时间"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"】，进行【冻结】");
        }
        if(Constants.equalsInteger(result.getType(),Constants.ZERO)){
            userAction.setType(Constants.TWO);
            userAction.setRemark("由【"+loginUserInfo.getUsername()+"】于【操作时间"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"】，进行【拉黑】");

        }
        userAction.setMemberId(result.getId()+"");
        userAction.setBeforeStatus(status);
        userActionJoinMapper.insert(userAction);
    }


    @Override
    public void updateRemoveStatusById(List<Member> members) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

        Date date=new Date();
        members.stream().forEach(s ->{
            Member result=memberMapper.selectById(s.getId());
            Integer status=result.getStatus();
            Member update = new Member();
            update.setEditDate(date);
            update.setEditor(loginUserInfo.getId());
            update.setStatus(Constants.Status.ENABLE.getValue());
            update.setId(s.getId());
            memberMapper.updateById(update);

            //解冻业务 处理用户授权导入记录
            this.thawMember(result);

            UserAction userAction=new UserAction();
            userAction.setIsdeleted(Constants.ZERO);
            userAction.setCreateDate(new Date());
            userAction.setCreator(loginUserInfo.getId());
            if(Constants.equalsInteger(result.getType(),Constants.TWO)){
                userAction.setType(Constants.ZERO);
                userAction.setBeforeStatus(Constants.ONE);
            }
            if(Constants.equalsInteger(result.getType(),Constants.ONE)){
                userAction.setBeforeStatus(status);
                userAction.setType(Constants.TWO);
            }
            userAction.setMemberId(result.getId()+"");
            userActionJoinMapper.insert(userAction);
        });
        //记录操作日志
        saveUserActionBiz(member,loginUserInfo,Constants.equalsInteger(member.getWorkStatus(),Constants.ONE)?Constants.UserActionType.WORK_OFF:Constants.UserActionType.WORK_ON,userActionJoinMapper);
    }




    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void updateCanVisitById(Member member) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(loginUserInfo == null){
            loginUserInfo = member.getLoginUserInfo();
        }
        Member model  =memberMapper.selectById(member.getId());
        if(model ==null) {
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，人员信息不存在！");
        }
        if(Constants.equalsInteger(member.getCanVisit(),model.getCanVisit())){
            //如果没有发生变化，直接返回
            return;
        }
        Member update = new Member();
        update.setEditDate(new Date());
        update.setId(member.getId());
        update.setEditor(loginUserInfo.getId());
        update.setCanVisit(member.getCanVisit());
        memberMapper.updateById(update);
        //记录操作日志
        saveUserActionBiz(member,loginUserInfo,Constants.equalsInteger(member.getCanVisit(),Constants.ONE)?Constants.UserActionType.CANVISIT:Constants.UserActionType.CANCEL_VISIT,userActionJoinMapper);
    }

    @Override
@@ -606,8 +985,7 @@
        MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.selectAll(Member.class)
                .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
                .selectAs(Company::getLinkName,MemberInfoDTO::getLinkName);
                .selectAs(Company::getName,Member::getCompanyName) ;

        if(null != member.getType()) {
            queryWrapper.eq(Member::getType,member.getType());
@@ -785,36 +1163,6 @@
    }

    @Override
    public PageData<MemberInfoDTO> findLaborMemberInfoPage(PageWrap<MemberInfoDTO> pageWrap) {
        IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
        MemberInfoDTO model = pageWrap.getModel();
        Utils.MP.blankToNull(model);
        Date end =pageWrap.getModel().getTrainTimeEndTime() !=null? Utils.Date.getEnd(pageWrap.getModel().getTrainTimeEndTime()):new Date();
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
              /*  .leftJoin(TrainTime.class,TrainTime::getMemberId,Member::getId)
                .leftJoin(Empower.class,Empower::getMemberId,Member::getId);*/

        queryWrapper.selectAll(Member.class)
                    .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
                    .selectAs(Company::getLinkName,MemberInfoDTO::getLinkName)
                /*.select(" (select Max(tt.END_TIME) from train_time tt where tt.ISDELETED=0 and tt.MEMBER_ID=t.id) as trainTimeEndTime")*/
                .select(" (select Max(e.END_TIME) from empower e where e.ISDELETED=0 and e.MEMBER_ID=t.id) as empowerEndTime");

        queryWrapper.eq(Member::getType,Constants.ZERO);
        queryWrapper.eq(Objects.nonNull(model.getCompanyId()),Member::getCompanyId,model.getCompanyId())
                    .like(StringUtils.isNotBlank(model.getName()),Member::getName,model.getName())
                    .like(StringUtils.isNotBlank(model.getPhone()),Member::getPhone,model.getPhone())
                    .like(StringUtils.isNotBlank(model.getIdcardDecode()),Member::getIdcardDecode,model.getIdcardDecode())
                    .having(pageWrap.getModel().getTrainTimeEndTime()!=null,"trainTimeEndTime < "+ DateUtil.format(end,"yyyy-MM-dd HH:mm:ss"));
        IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
        if (!CollectionUtils.isEmpty(memberIPage.getRecords())){
            memberIPage.getRecords().forEach(s->s.setSex(IdcardUtil.getGenderByIdCard(s.getIdcardDecode()) ==1?Constants.TWO:Constants.ONE));
        }
        return PageData.from(memberIPage);
    }

    @Override
    public long count(Member member) {
        QueryWrapper<Member> wrapper = new QueryWrapper<Member>(member);
        wrapper.lambda().like(StringUtils.isNotBlank(member.getRoleIdParam()), Member::getRoleId, member.getRoleIdParam());
@@ -839,16 +1187,22 @@
    }

    @Override
    public PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap) {
    public PageData<Member> findMemberInfoPage(PageWrap<MemberQuery> pageWrap) {
        IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();

        queryWrapper.selectAll(Member.class);
        queryWrapper.selectAs(Company::getName,Member::getCompanyName);
        queryWrapper.selectAs(SystemUser::getRealname,Member::getEditorName);
        queryWrapper.selectAs(Company::getType,Member::getCompanyType);
        queryWrapper.selectAs(Company::getHeadId,Member::getHeadId);
        queryWrapper.selectAs(Company::getCompanyNamePath,Member::getCompanyNamePath);
        queryWrapper.selectAs(Company::getCompanyPath,Member::getCompanyPath);
        queryWrapper.select(" ( select count(1) from member_card mc where mc.isdeleted = 0 and  mc.member_id = t.id ) as  memberCardCount ");
        queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Member::getEditor);
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.eq(Member::getType,pageWrap.getModel().getType());
//        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())
                .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyword()),ms->ms
@@ -862,18 +1216,29 @@
                .eq(Objects.nonNull(pageWrap.getModel().getHkStatus()),Member::getHkStatus,pageWrap.getModel().getHkStatus())
                .eq(Objects.isNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,Constants.ZERO)
                .eq(Objects.nonNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,pageWrap.getModel().getIsdeleted())
                .eq(Objects.nonNull(pageWrap.getModel().getCompanyType()),Company::getType,pageWrap.getModel().getCompanyType())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName())
//                .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
                .eq(Member::getType,Constants.memberType.internal)
//                .eq(Member::getType,Constants.memberType.internal)
                .eq(pageWrap.getModel().getHkStatus()!=null,Member::getHkStatus,pageWrap.getModel().getHkStatus())
                .orderByDesc(!Constants.equalsObject(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getCreateDate)
                .orderByDesc(Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getEditDate);
        if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
            queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
        }else{
            queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Member::getCompanyId,pageWrap.getModel().getCompanyId());
//            queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Member::getCompanyId,pageWrap.getModel().getCompanyId());
        }
        IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
        if(pageWrap.getModel().getCompanyId()!=null){
            if(pageWrap.getModel().getIncludeChild()!=null &&pageWrap.getModel().getIncludeChild() ){
                //如果包含下级组织
                Company company = companyMapper.selectById(pageWrap.getModel().getCompanyId());//查询组织信息
                queryWrapper.likeRight(Company::getCompanyPath,company.getCompanyPath());
            }else{
                //不包含下级组织
                queryWrapper.eq(Company::getId,pageWrap.getModel().getCompanyId());
            }
        }
        IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);

        if(CollectionUtils.isNotEmpty(memberIPage.getRecords())){
            //FTP文件访问前缀
@@ -883,8 +1248,11 @@
            List<DeviceRole> deviceRoleList = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
                            .select(DeviceRole::getId,DeviceRole::getName)
                    .eq(DeviceRole::getIsdeleted,Constants.ZERO));
            for (MemberInfoDTO memberInfoDTO:memberIPage.getRecords()) {
            for (Member memberInfoDTO:memberIPage.getRecords()) {
                //获得门禁组名称数组
                memberInfoDTO.setCanVisit(Constants.formatIntegerNum(memberInfoDTO.getCanVisit()));
                memberInfoDTO.setWorkStatus(Constants.formatIntegerNum(memberInfoDTO.getWorkStatus()));
                memberInfoDTO.setHeadStatus(Constants.equalsInteger(memberInfoDTO.getHeadId(),memberInfoDTO.getId())?Constants.ONE:Constants.ZERO);
                memberInfoDTO.setRoleNames(this.dealRoleDatas(memberInfoDTO.getRoleId(),deviceRoleList));
                //拼接前缀
                if(StringUtils.isNotBlank(memberInfoDTO.getFaceImg())){
@@ -925,13 +1293,13 @@
    }

    @Override
    public PageData<MemberInfoDTO> findVisitPage(PageWrap<MemberQuery> pageWrap) {
    public PageData<Member> findVisitPage(PageWrap<MemberQuery> pageWrap) {
        IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.selectAll(Member.class)
                .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
                .selectAs(Member::getLastVisitDate,MemberInfoDTO::getVisitsLastDate)
                .selectAs(Company::getName,Member::getCompanyName)
                .selectAs(Member::getLastVisitDate,Member::getLastVisitDate)
                .select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 and v.status  in (7,8) ) as visitsCount");
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Member::getName,pageWrap.getModel().getName())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getPhone()),Member::getPhone,pageWrap.getModel().getPhone())
@@ -948,21 +1316,21 @@
        if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
            queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
        }else{
            queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Member::getCompanyId,pageWrap.getModel().getCompanyId());
            queryWrapper.eq((pageWrap.getModel().getCompanyId())!=null,Member::getCompanyId,pageWrap.getModel().getCompanyId());
        }
        IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
        IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);
        return PageData.from(memberIPage);

    }


    @Override
    public PageData<MemberInfoDTO> findUnusualPage(PageWrap<MemberQuery> pageWrap) {
    public PageData<Member> findUnusualPage(PageWrap<MemberQuery> pageWrap) {
        IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.selectAll(Member.class)
                .selectAs(Company::getName,MemberInfoDTO::getCompanyName)
                .selectAs(Company::getName,Member::getCompanyName)
                .select(" (select ua.CREATE_DATE from user_action ua where ua.MEMBER_ID=t.id and ua.ISDELETED=0  order by ua.CREATE_DATE desc  limit 1) as optTime")
                .select(" (select s.REALNAME from user_action uac left join system_user s on uac.CREATOR = s.ID    where uac.MEMBER_ID=t.id and uac.ISDELETED=0 order by uac.CREATE_DATE desc  limit 1) as creatorName")
                .select(" (select STARTTIME from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 order by CREATE_DATE desc  limit 1) as visitsLastDate")
@@ -977,12 +1345,12 @@
                        .or().like(Member::getVisitCompanyName,pageWrap.getModel().getCompanyName()))
                .like(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,pageWrap.getModel().getIdcardNo())
                .eq(Member::getStatus,Constants.Status.FREEZE.getValue())
                .eq(StringUtils.isNotBlank(pageWrap.getModel().getCompanyId()),Company::getId,pageWrap.getModel().getCompanyId())
                .eq((pageWrap.getModel().getCompanyId())!=null,Company::getId,pageWrap.getModel().getCompanyId())
                .eq(Objects.nonNull(pageWrap.getModel().getCode()),Member::getCode,pageWrap.getModel().getCode())
                .orderByDesc(Member::getCreateDate);


        IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
        IPage<Member> memberIPage = memberJoinMapper.selectJoinPage(page, Member.class,queryWrapper);
        return PageData.from(memberIPage);

    }
@@ -1073,15 +1441,12 @@
           return;
        }
        List<Integer> memberIds = memberList.stream().map(m->m.getId()).collect(Collectors.toList());

        Date date = new Date();
        for (Integer id:memberIds) {
            UserAction userAction=new UserAction();
            userAction.setIsdeleted(Constants.ZERO);
            userAction.setCreateDate(new Date());
            userAction.setType(1);
            userAction.setRemark("由定时任务于【操作时间"+DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"】，进行【冻结】");
            userAction.setMemberId(id+"");
            userActionJoinMapper.insert(userAction);
            Member updateMember = new Member();
            updateMember.setId(id);
            updateMember.setEditDate(date);
            saveUserActionBiz(updateMember,null,Constants.UserActionType.FREEZE,userActionJoinMapper);
        }