工单业务

k94314517

2025-04-17 e12f190f8237c93a5054272ccd9f2eb15ac9e48a

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

@@ -220,6 +220,11 @@
            //不包含下级组织
            queryWrapper.exists(pageWrap.getModel().getCompanyId()!=null,"select (cm.id) from company_member cm where cm.company_id='"+pageWrap.getModel().getCompanyId()+"'  and cm.member_id=t.id");
        }

        if(Objects.nonNull(pageWrap.getModel().getIsSendCopy())&&Constants.equalsInteger(Constants.ONE,pageWrap.getModel().getIsSendCopy())){
            queryWrapper.apply(" t.id in ( select MEMBER_ID  from managers where  ISDELETED= 0 and STATUS = 0 and TYPE = 1  ) ");
        }

        queryWrapper.orderByAsc(Member::getCreateDate);
        PageData<Member> record =  PageData.from(memberMapper.selectJoinPage(page,Member.class, queryWrapper));
        if(record!=null && record.getRecords()!=null){
@@ -431,18 +436,18 @@
        }
        String token = systemDictDataBiz.queryByCode(Constants.QYWX,Constants.QYWX_TOKEN).getCode();
        //根据code换区企业微信ID
        QywxBaseResponse<String> qwIdBaseResponse= null;// QywxUtil.getUserInfoByCode(token,dto.getCode());
//        if(Objects.isNull(qwIdBaseResponse)||Objects.isNull(qwIdBaseResponse.getErrcode())){
//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"企业微信登录码解析失败，请联系管理员");
//        }
//        if(Constants.equalsInteger(qwIdBaseResponse.getErrcode(),Constants.ZERO)){
//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"企业微信登录失败："+qwIdBaseResponse.getErrmsg());
//        }
//        if(Objects.isNull(qwIdBaseResponse.getData())){
//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"企业微信用户信息解析失败，请联系管理员");
//        }
//        String qwId = qwIdBaseResponse.getData();
        String qwId = dto.getCode();
        QywxBaseResponse<String> qwIdBaseResponse= QywxUtil.getUserInfoByCode(token,dto.getCode());
        if(Objects.isNull(qwIdBaseResponse)||Objects.isNull(qwIdBaseResponse.getErrcode())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"企业微信登录码解析失败，请联系管理员");
        }
        if(!Constants.equalsInteger(qwIdBaseResponse.getErrcode(),Constants.ZERO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"企业微信登录失败："+qwIdBaseResponse.getErrmsg());
        }
        if(Objects.isNull(qwIdBaseResponse.getData())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"企业微信用户信息解析失败，请联系管理员");
        }
        String qwId = qwIdBaseResponse.getData();
//        String qwId = dto.getCode();
        Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getQwId,qwId).eq(Member::getIsdeleted,Constants.ZERO).last(" limit 1 "));
        if(Objects.isNull(member)){
            //根据企业微信ID 查询用户信息
@@ -450,7 +455,7 @@
            if(Objects.isNull(qywxUserInfoResponse)||Objects.isNull(qywxUserInfoResponse.getErrcode())){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"企业微信获取用户信息解析失败，请联系管理员");
            }
            if(Constants.equalsInteger(qywxUserInfoResponse.getErrcode(),Constants.ZERO)){
            if(!Constants.equalsInteger(qywxUserInfoResponse.getErrcode(),Constants.ZERO)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"企业微信获取用户信息失败："+qwIdBaseResponse.getErrmsg());
            }
            member = new Member();