fengjin
2022-12-05 4b92c6f30a86ad0f804614b2659c1dda368b8fdd
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
@@ -237,7 +237,7 @@
                WxUtil wxUtil=new WxUtil();
                String accessToken="0";
                try {
                    accessToken= stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get().toString();
                    accessToken= stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get();
                } catch (Exception e) {
                    throw new RuntimeException(e);
                }
@@ -245,7 +245,7 @@
                wxUtil.sendGuideRepairOrderComplete(submitUser.getOpenid(),accessToken,guideRepairOrderCompleteTemplateId,entity);
            }
            else if (order.getSubmitType().equals(2)){
                smsUtil.sendSmsComplete(order.getConsultUserPhone(),order.getMatterName());
                smsUtil.sendSmsCompleteNew(order.getConsultUserPhone(),order.getMatterName());
            }
            order.setState("4");
            entity.setState("7");
@@ -387,18 +387,16 @@
        String userId=null;
        if( StringUtils.equals("2",sysUser.getRoleIds()))
        {
//            if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
//            {
//                userId=null;
//            }
//            else
//            {
//                ids=null;
//                userId=sysUser.getUserId()+"";
//            }
            userId=sysUser.getUserId()+"";
//            ids=new ArrayList<>();
//            ids.add(sysUser.getDepartmentId());
            if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
            {
                ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
            }
            else
            {
                userId=sysUser.getUserId()+"";
                ids=new ArrayList<>();
                ids.add(sysUser.getDepartmentId());
            }
        }
        else
        {
@@ -422,18 +420,16 @@
        String userId=null;
        if( StringUtils.equals("2",sysUser.getRoleIds()))
        {
//            if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
//            {
//                userId=null;
//            }
//            else
//            {
//                ids=null;
//                userId=sysUser.getUserId()+"";
//            }
            userId=sysUser.getUserId()+"";
//            ids=new ArrayList<>();
//            ids.add(sysUser.getDepartmentId());
            if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
            {
                ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
            }
            else
            {
                userId=sysUser.getUserId()+"";
                ids=new ArrayList<>();
                ids.add(sysUser.getDepartmentId());
            }
        }
        else
        {
@@ -467,9 +463,25 @@
    @ApiOperation(value = "删除工单",response = GuideRepairOrder.class)
    @DeleteMapping("/delete/{id}")
    @Authorization
    public ResultData deleteConfigById(@PathVariable("id") String id)
    public ResultData deleteConfigById(@PathVariable("id") String id,@CurrentUser SysUser sysUser)
    {
        return toAjax(iGuideRepairOrderService.deleteConfigById(id));
        if(StringUtils.equals("1",sysUser.getUserType()) || StringUtils.equals("1",sysUser.getIsDivisionHead()) )
        {
            return toAjax(iGuideRepairOrderService.deleteConfigById(id));
        }
        return error("只有超管或者部门领导才能删除");
    }
    /**
     * 删除评论
     * @return
     */
    @ApiOperation(value = "删除评论",response = GuideRepairOrder.class)
    @GetMapping("/deleteComment")
    @Authorization
    public  ResultData deleteComment(@RequestParam(value = "id",required = false) Integer id,@CurrentUser  SysUser sysUser){
        return  iGuideRepairOrderService.deleteComment(id,sysUser);
    }