From f319da9fce782232b09d8587adb4c7e642f58204 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期六, 15 十月 2022 16:39:28 +0800
Subject: [PATCH] 修改小程序获取不到用户信息 bug
---
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 74 ++++++++++++++++++++++++++++++++-----
1 files changed, 64 insertions(+), 10 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
index 3bb5691..7b14947 100644
--- a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
@@ -2,15 +2,20 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.Slideshow;
+import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.db.gen.entity.TransactionEvent;
import com.dg.core.db.manual.pojo.QueryResults;
import com.dg.core.db.manual.pojo.RecommendResult;
import com.dg.core.db.manual.pojo.Search;
+import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.ITransactionEventService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;
@@ -26,6 +31,10 @@
@Autowired(required = true)
ITransactionEventService iTransactionEventService;
+
+ @Autowired(required = true)
+ IOrganizationChartService iOrganizationChartService;
+
/**
* 查询导办事务详情
* @param Id
@@ -33,10 +42,11 @@
*/
@ApiOperation("查询导办事务详情")
@GetMapping("/getData")
- public ResultData selectConfigData(@RequestParam("Id") String Id)
+
+ public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
{
Assert.notNull(Id, "Id 不能为空");
- return ResultData.success(iTransactionEventService.selectConfigData(Id));
+ return ResultData.success(iTransactionEventService.selectConfigData(Id,sysUser));
}
/**
@@ -46,16 +56,20 @@
*/
@ApiOperation("导办事物列表")
@GetMapping("/getList")
+ @Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
@RequestParam(value = "matterAndUser",required = false) String matterAndUser,
- @RequestParam(value = "classifyGrade",required = false) String classifyGrade)
+ @RequestParam(value = "classifyGrade",required = false) String classifyGrade,
+ @CurrentUser SysUser sysUser)
{
Assert.notNull(pageNum, "pageNum 不能为空");
Assert.notNull(pageSize, "pageSize 不能为空");
Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
- List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,matterAndUser,classifyGrade);
- int num=iTransactionEventService.countNum(matterAndUser,classifyGrade);
+ List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+ List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,matterAndUser,
+ classifyGrade,ids);
+ int num=iTransactionEventService.countNum(matterAndUser,classifyGrade,ids);
return getDataTable(list,num);
}
@@ -78,8 +92,25 @@
*/
@ApiOperation("新增导办事务")
@PostMapping("/add")
+ @Authorization
public ResultData insertConfig(@RequestBody TransactionEvent entity)
{
+ if(StringUtils.isEmpty(entity.getDepartmentId()))
+ {
+ return ResultData.error("部门id不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getMatterName()))
+ {
+ return ResultData.error("事件名称不能为空");
+ }
+
+ String id=iTransactionEventService.selectDataIfExist(entity.getDepartmentId(),entity.getMatterName());
+ if(!StringUtils.isEmpty(id))
+ {
+ return ResultData.error("事件名称已存在");
+ }
+
return toAjax(iTransactionEventService.insertConfig(entity));
}
@@ -90,8 +121,21 @@
*/
@ApiOperation("修改导办事务")
@PostMapping("/update")
+ @Authorization
public ResultData updateConfig(@RequestBody TransactionEvent entity)
{
+ if(StringUtils.isEmpty(entity.getDepartmentId()))
+ {
+ return ResultData.error("部门id不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getMatterName()))
+ {
+ return ResultData.error("事件名称不能为空");
+ }
+
+
+
return toAjax(iTransactionEventService.updateConfig(entity));
}
@@ -102,6 +146,7 @@
*/
@ApiOperation("删除导办事务")
@DeleteMapping("/delete")
+ @Authorization
public ResultData deleteConfigById(@RequestParam(value = "Id",required = false) String Id)
{
@@ -131,15 +176,23 @@
}
+
+
/**
- * 根据分离查询导办事务
+ * 根据分类id查询导办事务(分页)
* @param classifyId
* @return
*/
- @ApiOperation(value = "根据分类查询导办事务",response = TransactionEvent.class)
- @GetMapping("/queryByClassifyIdList")
- public TableDataInfo queryByClassifyIdList(@RequestParam("classifyId") String classifyId,@RequestParam(required = false,name="departmentId") Integer departmentId){
- return getDataTable(iTransactionEventService.queryByClassifyIdList(classifyId,departmentId),iTransactionEventService.countNumByClassifyIdList(classifyId,departmentId));
+ @ApiOperation(value = "根据分类id查询导办事务(分页)",response = TransactionEvent.class)
+ @GetMapping("/queryByClassifyIdConfigList")
+ public TableDataInfo queryByClassifyIdConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam("classifyId") String classifyId,
+ @RequestParam(required = false,name="departmentId") Integer departmentId){
+ Assert.notNull(pageNum, "pageNum 不能为空");
+ Assert.notNull(pageSize, "pageSize 不能为空");
+ Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
+ return getDataTable(iTransactionEventService.queryByClassifyIdList(pageParam,pageSize,classifyId,departmentId),iTransactionEventService.countNumByClassifyIdList(classifyId,departmentId));
}
/**
@@ -185,4 +238,5 @@
}
+
}
--
Gitblit v1.7.1