Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-16 b4c810707d70a7e5c72595d1e62ddaaa81d8eef2

 flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java

@@ -106,8 +106,7 @@
                        for (String departmentId : departmentIdsParent) {
                            OrganizationChartEntity organizationChart = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda().eq(OrganizationChartEntity::getId, departmentId));
                            OrganizationChartEntity organizationChartParent = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda().eq(OrganizationChartEntity::getId, organizationChart.getParentId()));
                            if (organizationChartParent!=null)
                            {
                            if (organizationChartParent != null) {
                                departmentIds.add(organizationChartParent.getId().toString());
                            }
                        }
@@ -438,8 +437,10 @@
    }

    @Override
    public int deleteComment(Integer id) {
    public ResultData deleteComment(Integer id, SysUser sysUser) {
        if (sysUser.getUserType().equals("1") || sysUser.getIsDivisionHead().equals("1")) {
        GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda().eq(GuideRepairOrder::getId, id));
            if (guideRepairOrder!=null&&guideRepairOrder.getState().equals("3")) {
        guideRepairOrder.setIsHideComments(1);
        baseMapper.updateById(guideRepairOrder);
        //新增删除评论进展
@@ -450,7 +451,15 @@
        entity.setFromUserId(guideRepairOrder.getSubmitUserId() + "");
        entity.setGuideId(guideRepairOrder.getId().toString());
        guideEvolveMapper.insertConfig(entity);
        return  baseMapper.updateById(guideRepairOrder);
                baseMapper.updateById(guideRepairOrder);
                return ResultData.success("删除评论成功");
            } else {
                ResultData.error("已办结的单据才能进行删除评论操作");
            }
        } else {
            ResultData.error("只能部门领导和超级管理员才能删除评论");
        }
        return  ResultData.error();
    }