修改回复模板 其他附件管理列表显示数据不全问题

lidongdong

2022-11-23 dd62520d2b9a10d494d0ad08995e3a9406e1154c

修改回复模板 其他附件管理列表显示数据不全问题

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

@@ -46,7 +46,7 @@
                                          @CurrentUser SysUser sysUser)
    {
        Page<ElseAccessoryEntity> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<String> ids= PermissionUtil.getStairDepartment(sysUser,iOrganizationChartService);
        List<ElseAccessoryEntity> list;
        if (sysUser.getUserType().equals("1")||sysUser.getIsDivisionHead().equals("1")){
            list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,null);

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

@@ -277,7 +277,4 @@

        return getDataTable(iOrganizationChartService.selectConfigList(ids));
    }



}

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

@@ -44,7 +44,7 @@
                                          @CurrentUser SysUser sysUser)
    {
        Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<String> ids=PermissionUtil.getStairDepartment(sysUser,iOrganizationChartService);
        List<ReplyTemplateEntity> list;
        if (sysUser.getUserType().equals("1")||sysUser.getIsDivisionHead().equals("1")){
            list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,null);

 flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java

@@ -80,4 +80,12 @@
     */
    List<String> getDepartmentId(String id);


    /**
     * 获取该部门的一级部门
     * @param id
     * @return
     */
    String getStairId(String id);

}

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

@@ -147,6 +147,48 @@
        return  departmentIds;
    }

    @Override
    public String getStairId(String id)
    {
        OrganizationChartEntity entity= baseMapper.selectConfigById(id);
        if(entity!=null && StringUtils.isEmpty(entity.getParentId()))
        {
            return entity.getId()+"";
        }
        else
        {
            return getParentId(entity.getParentId());
        }
    }


    /**
     * 根据id  获取一级部门id   递归
     * @param id
     * @return
     */
    public String getParentId(String id)
    {
        String ultimatelyId;
        OrganizationChartEntity entity= baseMapper.selectConfigById(id);
        if(entity==null)
        {
            return id;
        }

        if(!StringUtils.isEmpty(entity.getParentId()))
        {
            ultimatelyId= getParentId(entity.getParentId());
            return ultimatelyId;
        }
        else
        {
            ultimatelyId=entity.getId()+"";
            return ultimatelyId;
        }
    }



    public  String parentId(String id){
        String parentId=id;

 flower_city/src/main/java/com/dg/core/util/PermissionUtil.java

@@ -1,11 +1,8 @@
package com.dg.core.util;

import com.dg.core.controller.OrganizationController;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.impl.OrganizationChartImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
@@ -73,4 +70,32 @@
        }
    }


    /**
     * 通过部门id 获取一级部门下的全部子部门以及一级部门
     * @param sysUser
     * @param iOrganizationChartService
     * @return
     */
    public static List<String> getStairDepartment(SysUser sysUser,IOrganizationChartService iOrganizationChartService)
    {
        if(StringUtils.equals("1", sysUser.getUserType()))
        {
            //管理员
            List<String> ids=null;
            return ids;
        }
        else
        {
            //获取一级部门id
            String stairId= iOrganizationChartService.getStairId(sysUser.getDepartmentId());
            List<String> ids=iOrganizationChartService.getIds(stairId);
            return ids;
        }
    }





}