Commit 31fe167b by hzc

从前端获取userId

parent 3b0af0b7
...@@ -123,10 +123,9 @@ public class ShortboardUnitService { ...@@ -123,10 +123,9 @@ public class ShortboardUnitService {
result = shortboardRuleService.getObjFromShortboardRule(shortBoardWarnData); result = shortboardRuleService.getObjFromShortboardRule(shortBoardWarnData);
} }
if(!result.isEmpty()) { if(!result.isEmpty()) {
String currentUserId = SystemUserUtil.getCurrentUserId();
for(ShortboardRecord shortboardRecord : result) { for(ShortboardRecord shortboardRecord : result) {
shortboardRecord.setUserId(currentUserId); shortboardRecord.setUserId(shortBoardWarnData.getUser());
shortboardRecord.setDepartment(shortBoardWarnData.getDepartment()); shortboardRecord.setDepartment(shortBoardWarnData.getDepartment());
shortboardRecord.setShortboardUnitId(shortBoardWarnData.getId()); shortboardRecord.setShortboardUnitId(shortBoardWarnData.getId());
} }
...@@ -145,7 +144,7 @@ public class ShortboardUnitService { ...@@ -145,7 +144,7 @@ public class ShortboardUnitService {
Map<String,Object> paramMap = new HashMap<>(); Map<String,Object> paramMap = new HashMap<>();
Map<String,Object> result = new HashMap<>(); Map<String,Object> result = new HashMap<>();
paramMap.put("codes", codes); paramMap.put("codes", codes);
paramMap.put("userId",SystemUserUtil.getCurrentUserId()); paramMap.put("userId",SystemUserUtil.getCurrentUserName());
int count = shortboardRecordMapper.countByCodeIn(paramMap); int count = shortboardRecordMapper.countByCodeIn(paramMap);
//计算start //计算start
int start = page*rows; int start = page*rows;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment