bug调试
This commit is contained in:
parent
80df6d082d
commit
feab351a4f
|
|
@ -81,10 +81,14 @@ public class TmTaskServiceImpl implements TmTaskService {
|
||||||
private RemoteUserService remoteUserService;
|
private RemoteUserService remoteUserService;
|
||||||
|
|
||||||
private final static String STRING_ADMIN = "admin";
|
private final static String STRING_ADMIN = "admin";
|
||||||
private final static String STRING_SGB = "sgb";
|
|
||||||
private final static String STRING_AJB = "sgb";
|
|
||||||
private final static String STRING_JJFGS = "jjfgs";
|
private final static String STRING_JJFGS = "jjfgs";
|
||||||
private final static String STRING_TSFGS = "tsfgs";
|
private final static String STRING_TSFGS = "tsfgs";
|
||||||
|
private final static String STRING_JJBZ = "jjbz";
|
||||||
|
private final static String STRING_FBZ = "fbz";
|
||||||
|
private final static String STRING_EM01 = "em01";
|
||||||
|
private final static String STRING_EM02 = "em02";
|
||||||
|
private final static String STRING_EM03 = "em03";
|
||||||
|
private final static String STRING_DM01 = "dm01";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 领料任务审核状态
|
* 领料任务审核状态
|
||||||
|
|
@ -652,14 +656,14 @@ public class TmTaskServiceImpl implements TmTaskService {
|
||||||
@Override
|
@Override
|
||||||
public List<TmTask> getLeaseOutListByUser(TmTask task) {
|
public List<TmTask> getLeaseOutListByUser(TmTask task) {
|
||||||
Set<String> roles = SecurityUtils.getLoginUser().getRoles();
|
Set<String> roles = SecurityUtils.getLoginUser().getRoles();
|
||||||
Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
|
if (roles.contains(STRING_ADMIN)) {
|
||||||
if (roles.contains("admin")) {
|
|
||||||
return tmTaskMapper.getLeaseOutListByAdmin(task);
|
return tmTaskMapper.getLeaseOutListByAdmin(task);
|
||||||
} else if (roles.contains("jjbz") || roles.contains("fbz") || deptId == 101) {
|
} else if (roles.contains(STRING_JJBZ) || roles.contains(STRING_FBZ) || roles.contains(STRING_EM01)
|
||||||
//机具班长、副班长、机具分公司可以查看机具设备
|
|| roles.contains(STRING_EM02) || roles.contains(STRING_EM03)) {
|
||||||
|
//机具班长、副班长、机具经理、机具副经理、安全员可以查看机具设备
|
||||||
return tmTaskMapper.getLeaseOutListByjjbz(task);
|
return tmTaskMapper.getLeaseOutListByjjbz(task);
|
||||||
} else if (deptId == 102) {
|
} else if (roles.contains(STRING_DM01)) {
|
||||||
//调试分公司可以查看调试设备
|
//调试经理可以查看调试设备
|
||||||
return tmTaskMapper.getLeaseOutListByts(task);
|
return tmTaskMapper.getLeaseOutListByts(task);
|
||||||
} else {
|
} else {
|
||||||
return tmTaskMapper.getLeaseOutListByUser(task);
|
return tmTaskMapper.getLeaseOutListByUser(task);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue