Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java

@@ -84,9 +84,9 @@
        ComPbServiceTeamDO oldComPbServiceTeam =
            comPbServiceTeamDAO.selectComPbServiceTeamById(comPbServiceTeamDTO.getId());
        String oldphone = oldComPbServiceTeam.getPhone();
        SysUserVO sysUserOld = comPbMemberRoleDAO.getSysUserByPhone(oldphone);
        SysUserVO sysUserOld = comPbMemberRoleDAO.getSysUserByPhone(oldphone, comPbServiceTeamDTO.getAppid());
        String newphone = comPbServiceTeamDTO.getPhone();
        SysUserVO sysUserNew = comPbMemberRoleDAO.getSysUserByPhone(newphone);
        SysUserVO sysUserNew = comPbMemberRoleDAO.getSysUserByPhone(newphone, comPbServiceTeamDTO.getAppid());
        if (!ObjectUtils.isEmpty(sysUserOld) || !ObjectUtils.isEmpty(sysUserNew)) {
            comPbServiceTeamDO.setIsReg(1);
        }
@@ -118,6 +118,9 @@
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComPbServiceTeamVO> iPage = comPbServiceTeamDAO.PageComPbServiceTeamDTO(page, pageComPbServiceTeamDTO);
        if (nonNull(pageComPbServiceTeamDTO.getPropertyId())){
        iPage = comPbServiceTeamDAO.pageServiceTeamProperty(page, pageComPbServiceTeamDTO);
        }
        return R.ok(iPage);
    }

@@ -138,7 +141,7 @@
        int delete = comPbServiceTeamDAO.deleteById(comPbServiceTeamDTO.getId());
        if (delete > 0) {

            SysUserVO sysUserVO = comPbMemberRoleDAO.getSysUserByPhone(comPbServiceTeamDO.getPhone());
            SysUserVO sysUserVO = comPbMemberRoleDAO.getSysUserByPhone(comPbServiceTeamDO.getPhone(), comPbServiceTeamDTO.getAppid());
            // 删除用户信息缓存
            if (sysUserVO != null) {
                Long userId = sysUserVO.getUserId();