From 6a94451b8c17ee4fd19c44bb3d7d2011f83e806b Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 14 十一月 2023 16:45:53 +0800
Subject: [PATCH] 锁数值类型更改
---
ard-work/src/main/java/com/ruoyi/plan/controller/ArdEplanController.java | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/plan/controller/ArdEplanController.java b/ard-work/src/main/java/com/ruoyi/plan/controller/ArdEplanController.java
index eb9dd3b..6e8904a 100644
--- a/ard-work/src/main/java/com/ruoyi/plan/controller/ArdEplanController.java
+++ b/ard-work/src/main/java/com/ruoyi/plan/controller/ArdEplanController.java
@@ -64,12 +64,7 @@
{
startPage();
List<ArdEplan> list = ardEplanService.selectArdEplanList(ardEplan);
- List<Map<String,Object>> result = new ArrayList();
for(ArdEplan para : list){
- Map<String,Object> map = new HashMap();
- map.put("id",para.getId());
- map.put("name",para.getName());
- map.put("time",para.getTime());
String info = para.getInfo();
String[] infoArr = info.split(";");
List<Map<String,String>> infoList = new ArrayList();
@@ -81,20 +76,16 @@
infoMap.put("text",str.split(",")[3]);
infoList.add(infoMap);
}
- map.put("obj",infoList);
- map.put("userId",para.getUserId());
- map.put("deptId",para.getDeptId());
- map.put("createBy",para.getCreateBy());
- result.add(map);
+ para.setInfoList(infoList);
}
- return getDataTable(result);
+ return getDataTable(list);
}
/**
* 瀵煎嚭搴旀�ラ妗堝垪琛�
*/
- @PreAuthorize("@ss.hasPermi('plan:eplan:export')")
+ /*@PreAuthorize("@ss.hasPermi('plan:eplan:export')")
@Log(title = "搴旀�ラ妗�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ArdEplan ardEplan)
@@ -102,7 +93,7 @@
List<ArdEplan> list = ardEplanService.selectArdEplanList(ardEplan);
ExcelUtil<ArdEplan> util = new ExcelUtil<ArdEplan>(ArdEplan.class);
util.exportExcel(response, list, "搴旀�ラ妗堟暟鎹�");
- }
+ }*/
/**
* 鑾峰彇搴旀�ラ妗堣缁嗕俊鎭�
@@ -242,7 +233,7 @@
ArdEplan result = ardEplanService.selectArdEplanById(ids[0]);
String userId = SecurityUtils.getUserId();
SysUser sysUser = userService.selectUserById(userId);
- if(!result.getDeptId().equals(sysUser.getDeptId())){
+ if(!result.getDeptId().equals(String.valueOf(sysUser.getDeptId()))){
return toAjax(0);//闈炴湰閮ㄩ棬棰勬鏃犳硶鍒犻櫎
}
return toAjax(ardEplanService.deleteArdEplanByIds(ids));
--
Gitblit v1.9.3