java/qijisheng.git

			@@ -42,6 +42,8 @@
			private AppUserClient appUserClient;
			@Resource
			private ShopClient shopClient;



			/**
			* 分享列表
			@@ -148,13 +150,13 @@

			@ApiOperation(value = "广告管理-分享管理-列表", tags = {"管理后台"})
			@GetMapping("/manage/list")
			public R<Page<Share>> managelist(String name, Integer addType, @RequestParam Integer pageCurr, Integer pageSize) {
			public R<Page<Share>> managelist(String name, Integer addType, @RequestParam Integer pageNum, Integer pageSize) {
			//判断当前登陆人是平台还是门店
			if (tokenService.getLoginUser().getSysUser().getRoleType()==1) {
			Page<Share> page = shareService.lambdaQuery().eq(Share::getAuditStatus, 1).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageCurr, pageSize));
			Page<Share> page = shareService.lambdaQuery().eq(Share::getAuditStatus, 1).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageNum, pageSize));
			return R.ok(page);
			}else {
			Page<Share> page = shareService.lambdaQuery().eq(Share::getAddType,3).eq(Share::getObjectId, tokenService.getLoginUser().getSysUser().getObjectId()).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageCurr, pageSize));
			Page<Share> page = shareService.lambdaQuery().eq(Share::getAddType,3).eq(Share::getObjectId, tokenService.getLoginUser().getSysUser().getObjectId()).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageNum, pageSize));
			return R.ok(page);
			}
			}
			@@ -185,8 +187,10 @@
			for (Share record : page.getRecords()) {
			if (record.getAddType() == 2) {
			AppUser appUserById = appUserClient.getAppUserById(Long.valueOf(record.getObjectId()));
			record.setAuthName(appUserById.getName());
			record.setAuthPhone(appUserById.getPhone());
			if (appUserById!=null) {
			record.setAuthName(appUserById.getName());
			record.setAuthPhone(appUserById.getPhone());
			}
			}
			if (record.getAddType() == 3) {
			R<Shop> shopById = shopClient.getShopById(Integer.valueOf(record.getObjectId()));
			@@ -216,5 +220,8 @@
			}





			}