|
|
@ -106,7 +106,12 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM |
|
|
|
SysUser sysUser = UserUtils.getUser(); |
|
|
|
|
|
|
|
BsSgcjsjdBuiProInfo data = sp.getData(); |
|
|
|
|
|
|
|
if (sysUser.getUserType().equals("00") && data.getAdcd() == null) { |
|
|
|
String deptId = sysUser.getDeptId(); |
|
|
|
SysDept sysDept = sysDeptService.get(deptId); |
|
|
|
String xzqhId = sysDept.getXzqhId(); |
|
|
|
data.setAdcd(xzqhId); |
|
|
|
} |
|
|
|
Map<String, Object> params = sp.getParams(); |
|
|
|
|
|
|
|
assert sysUser != null; |
|
|
@ -115,11 +120,11 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM |
|
|
|
|
|
|
|
if (ObjectUtil.isNull(params)) { |
|
|
|
list = bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(), |
|
|
|
sysXzqhService.getSubString(sp.getData().getAdcd()), |
|
|
|
sysXzqhService.getSubString(data.getAdcd()), |
|
|
|
"create_time", sp.getPageNum(), sp.getPageSize()); |
|
|
|
} else { |
|
|
|
list = bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getId(), sysUser.getUserType(), data.getId(), |
|
|
|
data.getProjectName(), sysXzqhService.getSubString(sp.getData().getAdcd()), (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize()); |
|
|
|
data.getProjectName(), sysXzqhService.getSubString(data.getAdcd()), (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize()); |
|
|
|
} |
|
|
|
|
|
|
|
Page<BsSgcjsjdBuiProInfo> page = new Page<>(); |
|
|
@ -156,7 +161,12 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM |
|
|
|
SysUser sysUser = UserUtils.getUser(); |
|
|
|
|
|
|
|
BsSgcjsjdBuiProInfo data = sp.getData(); |
|
|
|
|
|
|
|
if (sysUser.getUserType().equals("00") && data.getAdcd() == null) { |
|
|
|
String deptId = sysUser.getDeptId(); |
|
|
|
SysDept sysDept = sysDeptService.get(deptId); |
|
|
|
String xzqhId = sysDept.getXzqhId(); |
|
|
|
data.setAdcd(xzqhId); |
|
|
|
} |
|
|
|
Map<String, Object> params = sp.getParams(); |
|
|
|
|
|
|
|
String isMajor = null; |
|
|
@ -174,12 +184,12 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
assert sysUser != null; |
|
|
|
// assert sysUser != null;
|
|
|
|
IPage<BsSgcjsjdBuiProInfo> list = null; |
|
|
|
|
|
|
|
|
|
|
|
list = bsSgcjsjdBuiProInfoMapper.selectManagePage(sysUser.getId(),sysUser.getUserType(),data.getId(), data.getProjectName(), isMajor, projectType, |
|
|
|
sysXzqhService.getSubString(sp.getData().getAdcd()), |
|
|
|
sysXzqhService.getSubString(data.getAdcd()), |
|
|
|
"create_time", new Page<>(sp.getPageNum(), sp.getPageSize())); |
|
|
|
|
|
|
|
|
|
|
@ -242,7 +252,12 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM |
|
|
|
SysUser sysUser = UserUtils.getUser(); |
|
|
|
|
|
|
|
BsSgcjsjdBuiProInfo data = sp.getData(); |
|
|
|
|
|
|
|
if (sysUser.getUserType().equals("00") && data.getAdcd() == null) { |
|
|
|
String deptId = sysUser.getDeptId(); |
|
|
|
SysDept sysDept = sysDeptService.get(deptId); |
|
|
|
String xzqhId = sysDept.getXzqhId(); |
|
|
|
data.setAdcd(xzqhId); |
|
|
|
} |
|
|
|
Map<String, Object> params = sp.getParams(); |
|
|
|
|
|
|
|
String isMajor = null; |
|
|
@ -264,8 +279,9 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM |
|
|
|
IPage<BsSgcjsjdBuiProInfo> list = null; |
|
|
|
|
|
|
|
|
|
|
|
list = bsSgcjsjdBuiProInfoMapper.selectManagePage(sysUser.getId(),sysUser.getUserType(),data.getId(), data.getProjectName(), isMajor, projectType, |
|
|
|
sysXzqhService.getSubString(sp.getData().getAdcd()), |
|
|
|
list = bsSgcjsjdBuiProInfoMapper.selectManagePage(sysUser.getId(), |
|
|
|
sysUser.getUserType(),data.getId(), data.getProjectName(), isMajor, projectType, |
|
|
|
sysXzqhService.getSubString(data.getAdcd()), |
|
|
|
"create_time", new Page<>(sp.getPageNum(), sp.getPageSize())); |
|
|
|
|
|
|
|
|
|
|
|