|
@@ -1695,24 +1695,14 @@ public class ApiController {
|
|
|
public R getUserScorePackageList2(Page page, int selType, String packageName, String selDate, String activeId) {
|
|
|
|
|
|
UserVO userVO = sysUserService.selectUserVoById(SecurityUtils.getUser().getId());
|
|
|
-// Page scorePage = null;
|
|
|
|
|
|
- List<WmScorePackageApiOutput> scorePackageList = new ArrayList<>();
|
|
|
+ List<WmScorePackageApiOutput> scorePackageList;
|
|
|
if (1 == selType && isZbRole(userVO.getRoleList(), 5)) {
|
|
|
return R.ok();
|
|
|
}
|
|
|
|
|
|
|
|
|
// LambdaQueryWrapper<WmScorePackage> scoreQuery = Wrappers.lambdaQuery(query);
|
|
|
-// Boolean inFlag = false;
|
|
|
-
|
|
|
-
|
|
|
- List<Map<String, Object>> resultList = new ArrayList<>();
|
|
|
-
|
|
|
-// String packageType2 = "1";
|
|
|
-// if("1".equals(userVO.getUserType())){
|
|
|
-// packageType2 = "2";
|
|
|
-// }
|
|
|
|
|
|
IPage<WmScorePackageApiOutput> scorePage;
|
|
|
// 小程序角色:5-全职学术信息沟通专员, 6-兼职学术信息沟通专员, 10-兼职CRC, 13-HCP
|
|
@@ -1724,9 +1714,6 @@ public class ApiController {
|
|
|
query.setScorePackageName(packageName);
|
|
|
query.setBelongDate(selDate);
|
|
|
query.setZbId(userVO.getUserId() + "");
|
|
|
-// query.setPackageType2(packageType2);
|
|
|
-
|
|
|
-// scorePage = wmScorePackageService.page(page, scoreQuery);
|
|
|
scorePage = wmScorePackageService.getPackageListForReceive(page, query);
|
|
|
scorePackageList = scorePage.getRecords();
|
|
|
|