修改Bug

fengjin

2022-10-11 6146f0043b30f68440047011e4ec28fbcdb3e6ef

修改Bug

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

@@ -44,6 +44,17 @@
    {
        Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
        String[] roles = sysUser.getRoleIds().split(",");
        Integer isRole=0;//是否超管
        for (String role: roles) {
            if (role.equals("1")){
                isRole=1;
                break;
            }
        }
        if (isRole.equals(1)){
            ids=null;
        }
        List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
        int num=iReplyTemplateService.countNum(Name,ids);
        return getDataTable(list,num);
@@ -85,7 +96,6 @@
        {
            return ResultData.error("模板名称不能为空");
        }

        entity.setId(null);
        entity.setDepartmentId(sysUser.getDepartmentId());
        entity.setCreateUserId(sysUser.getUserId()+"");

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

@@ -49,7 +49,7 @@
                departmentIds.add(organizationChart.getId().toString());
            }
            List<SysUser> sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getClassifyId(), transactionEvent.getClassifyId() + ",");//获取导半人员
            if (sysUsers==null) {//如果此所属地区部门没有导半人员则看其下级地区有没有相关分类导办人员
            if (sysUsers.size()==0) {//如果此所属地区部门没有导半人员则看其下级地区有没有相关分类导办人员
                for (OrganizationChartEntity organizationChart:organizationChartEntities) {
                    //获取下级部门
                    List<OrganizationChartEntity> organizationChartEntitiesUser = organizationChartMapper.selectList(new QueryWrapper<OrganizationChartEntity>().lambda()
@@ -58,13 +58,13 @@
                        departmentIds=this.getDepartmentIds(organizationChartEntitiesUser,departmentIds);
                }
                sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getClassifyId(), transactionEvent.getClassifyId() + ",");//获取导半人员
                if (sysUsers==null){//如果其下级部门仍没有该分类的导半人员则查询所以该所属地区的导办人员
                if (sysUsers.size()==0){//如果其下级部门仍没有该分类的导半人员则查询所以该所属地区的导办人员
                    sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds,null,null);//获取导半人员
                    if(sysUsers==null)//如果该所属地区没有导办人员则为特殊单据需要手动分配
                    if(sysUsers.size()==0)//如果该所属地区没有导办人员则为特殊单据需要手动分配
                        guideRepairOrder.setState("1");
                }
            }
            if (sysUsers!=null){//系统分配导办人员
            if (sysUsers.size()>0){//系统分配导办人员
                SysUser sysUser = sysUsers.get(0);//因为sql用了升序排序所以第一条就是待办结最少的人员之一
                guideRepairOrder.setState("2");
                sysUser.setTransactionNum(sysUser.getTransactionNum()+1);