Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

 flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java

@@ -332,7 +332,7 @@
        GuideEvolveEntity guideEvolveEntity=new GuideEvolveEntity();
        guideEvolveEntity.setCreateTime(LocalDateTime.now());
        guideEvolveEntity.setUpdateTime(LocalDateTime.now());
        guideEvolveEntity.setState("3");
        guideEvolveEntity.setState("13");
        guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
        guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
        guideEvolveEntity.setGuideId(entity.getId().toString());
@@ -374,16 +374,19 @@
        Assert.notNull(pageSize, "pageSize 不能为空");
        Page<GuideRepairOrder> pageParam = new Page<>(pageNum,pageSize);

        List<String> ids=null;
        List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        String userId=null;
        if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
        if( StringUtils.equals("2",sysUser.getRoleIds()))
        {
            userId=null;
            ids= PermissionUtil.getPermission(sysUser);
        }
        else
        {
            userId=sysUser.getUserId()+"";
            if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
            {
                userId=null;
            }
            else
            {
                ids=null;
                userId=sysUser.getUserId()+"";
            }
        }

        List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,
@@ -399,17 +402,21 @@
    public ResultData getWorkOrder(@CurrentUser SysUser sysUser)
    {
        WorkOrder workOrder=new WorkOrder();
        List<String> ids=null;
        List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        String userId=null;
        if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
        if( StringUtils.equals("2",sysUser.getRoleIds()))
        {
            userId=null;
            ids= PermissionUtil.getPermission(sysUser);
            if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
            {
                userId=null;
            }
            else
            {
                ids=null;
                userId=sysUser.getUserId()+"";
            }
        }
        else
        {
            userId=sysUser.getUserId()+"";
        }

        //状态（1待分配  2 待办结 3 已办结 4 待评价 5 已取消  ）
        workOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum("",ids,null,null,null,null,null,userId));
        workOrder.setWaitDistribution(iGuideRepairOrderService.countStatisticsNum("1",ids,null,null,null,null,null,userId));