From e87d9f3de8d80ccdca1aaad4c5ff75abf9801428 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 16 十一月 2022 17:19:41 +0800
Subject: [PATCH] 1.添加智能质询访问表实体类 2.添加智能质询访问相关功能并统计数据 3.修改门户网搜索结果

---
 flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java b/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
index fe90412..fb1fc73 100644
--- a/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
@@ -44,12 +44,13 @@
                                           @CurrentUser SysUser sysUser)
     {
         Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
-        List<String> ids= PermissionUtil.getPermission(sysUser);
-        if(ids==null || ids.size()<1)
-        {
-            return getDataTable("您没有权限查看该数据");
+        List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+        List<ReplyTemplateEntity> list;
+        if (sysUser.getUserType().equals("2")){
+              list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,sysUser.getUserId());}
+        else {
+            list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,null);
         }
-        List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
         int num=iReplyTemplateService.countNum(Name,ids);
         return getDataTable(list,num);
     }
@@ -91,12 +92,12 @@
             return ResultData.error("模板名称不能为空");
         }
 
-        if(StringUtils.isEmpty(sysUser.getDepartmentId()))
+        if(StringUtils.isEmpty(entity.getDepartmentId()))
         {
             return ResultData.error("部门id不能为空  请分配部门id");
         }
 
-        List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+        List<String> ids=iOrganizationChartService.getIds(entity.getDepartmentId());
         int num=iReplyTemplateService.countNum(entity.getName(),ids);
 
         if(num>0)
@@ -105,7 +106,7 @@
         }
 
         entity.setId(null);
-        entity.setDepartmentId(sysUser.getDepartmentId());
+        entity.setDepartmentId(entity.getDepartmentId());
         entity.setCreateUserId(sysUser.getUserId()+"");
 
         return toAjax(iReplyTemplateService.insertConfig(entity));

--
Gitblit v1.7.1