Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

fengjin

2022-10-20 d0d56dd3d9bde2a5b0b8c952681a8c9850224b5d

Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

 flower_city/src/main/java/com/dg/core/api/ElseAccessoryAppletsController.java

@@ -43,7 +43,7 @@
    public TableDataInfo selectConfigListAll(@RequestParam(value = "Name",required = false) String Name,
                                             @CurrentUser SysUser sysUser)
    {
        List<String> ids= PermissionUtil.getPermission(sysUser);
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        if(ids==null || ids.size()<1)
        {
            return getDataTable("您没有权限查看该数据");

 flower_city/src/main/java/com/dg/core/api/ReplyTemplateAppletsController.java

@@ -45,7 +45,7 @@
                                          @CurrentUser SysUser sysUser)
    {
        Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids= PermissionUtil.getPermission(sysUser);
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        if(ids==null || ids.size()<1)
        {
            return getDataTable("您没有权限查看该数据");

 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);
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        if(ids==null || ids.size()<1)
        {
            return getDataTable("您没有权限查看该数据");
@@ -67,7 +67,7 @@
    public TableDataInfo selectConfigListAll(@RequestParam(value = "Name",required = false) String Name,
                                             @CurrentUser SysUser sysUser)
    {
        List<String> ids= PermissionUtil.getPermission(sysUser);
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        if(ids==null || ids.size()<1)
        {
            return getDataTable("您没有权限查看该数据");

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

@@ -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));

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

@@ -187,5 +187,4 @@
        }
        return 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);
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        if(ids==null || ids.size()<1)
        {
            return getDataTable("您没有权限查看该数据");

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

@@ -1,23 +1,23 @@
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;
import java.util.Collections;
import java.util.List;

@RestController
public class PermissionUtil
{

    @Autowired(required = true)
    static IOrganizationChartService iOrganizationChartService;


    public static List<String> getPermission(SysUser sysUser) {

    public static List<String> getPermission(SysUser sysUser,IOrganizationChartService iOrganizationChartService)
    {
        if (StringUtils.equals("3", sysUser.getRoleIds())) {
            if (StringUtils.isEmpty(sysUser.getDataPermission())) {
                return null;
@@ -46,7 +46,7 @@
        else if(StringUtils.equals("1", sysUser.getRoleIds()))
        {
            //管理员
            List<String> ids=iOrganizationChartService.getIds(null);
            List<String> ids=iOrganizationChartService.getIds("");
            return ids;
        }
        else