suojin
/
jonhon-mes-svr
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

暂存

Browse Source
liweidong
liweidong-hj 2 weeks ago
parent 86826c1be5
commit 9c244824d3
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java

6
blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
Unescape View File

@ -488,8 +488,8 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
dsTasking.setTaskStatusList(list); dsTasking.setTaskStatusList(list);
} }
String roleName = AuthUtil.getUser().getRoleName(); String roleName = AuthUtil.getUser().getRoleName();
if("craftMan".equals(roleName)){ if("rb_craft".equals(roleName) || "sj_craft".equals(roleName)){
dsTasking.setCraftMan(AuthUtil.getUser().getNickName()); dsTasking.setCraftMan(AuthUtil.getUser().getUserId().toString());
}; };
List<DsTaskingVO> dsTaskingList = baseMapper.selectDisposeList(page, dsTasking); List<DsTaskingVO> dsTaskingList = baseMapper.selectDisposeList(page, dsTasking);
if(!CollectionUtils.isEmpty(dsTaskingList)){ if(!CollectionUtils.isEmpty(dsTaskingList)){
@ -501,7 +501,7 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
if (userInfoR != null && userInfoR.getData() != null) { if (userInfoR != null && userInfoR.getData() != null) {
User user = userInfoR.getData().getUser(); User user = userInfoR.getData().getUser();
if (user != null) { if (user != null) {
dsTaskingVO.setCraftMan(user.getName()); dsTaskingVO.setCraftMan(user.getRealName());
} }
} }
} catch (Exception e) { } catch (Exception e) {

Write Preview
Loading…
Cancel
Save