From 9aef366a4aa40f3188c5f21e4e6c0cc89af9bf16 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 20 十月 2022 17:42:24 +0800
Subject: [PATCH] update
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
index 4827180..68a93e6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
@@ -87,13 +87,13 @@
expert.setCreateTime(new Date());
if (expert.getLevel()==2){
expert.setIndustryCenterId(Long.parseLong(expert.getUnitId()));
- expert.setUnit(comSanshuoIndustryCenterDao.selectById(expert.getUnitId()).getName()+"调解站");
+ expert.setUnit(comSanshuoIndustryCenterDao.selectById(expert.getUnitId()).getName());
}else if(expert.getLevel()==3){
expert.setStreetId(Long.parseLong(expert.getUnitId()));
expert.setUnit(comStreetDAO.selectById(expert.getUnitId()).getName()+"调解站");
}else if(expert.getLevel()==4){
expert.setCommunityId(Long.parseLong(expert.getUnitId()));
- expert.setUnit(comActDAO.selectById(expert.getUnitId()).getName()+"调解站");
+ expert.setUnit(comActDAO.selectById(expert.getUnitId()).getName()+"调解室");
}else{
expert.setUnit("区三说会堂");
}
@@ -177,12 +177,13 @@
id=loginUserInfo.getStreetId();
}
}
- }log.info("==================="+loginUserInfo);
+ }
if (loginUserInfo.getAccount().equals("admin")){
//三说会堂查看所有专家
id=null;
range=1;
}
+ log.info("");
IPage<ComSanshuoExpertVO> comSanshuoExpertVOIPage = comSanshuoExpertDao.expertPage(new Page(page, size), keyWord, range, id, level);
for (ComSanshuoExpertVO record : comSanshuoExpertVOIPage.getRecords()) {
//获取调解次数和成功率
@@ -416,20 +417,20 @@
}
@Override
- public R backstageList(Integer level,LoginUserInfoVO loginUserInfoVO) {
+ public R backstageList(Integer level,LoginUserInfoVO loginUserInfoVO,Integer page,Integer size) {
if (nonNull(level)){
if (level.equals(1)){
//三说会堂权限，查看所有
- return R.ok(comSanshuoExpertDao.selectList(null));
+ return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,null));
}else if (level.equals(2)){
//行业分中心
ComSanshuoIndustryCenter center = comSanshuoIndustryCenterDao.selectOne(new QueryWrapper<ComSanshuoIndustryCenter>().lambda().eq(ComSanshuoIndustryCenter::getAccount, loginUserInfoVO.getAccount()));
- return R.ok(comSanshuoExpertDao.selectList(new QueryWrapper<ComSanshuoExpert>().lambda().eq(ComSanshuoExpert::getIndustryCenterId,center.getId())));
+ return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,center.getId()));
}else if (level.equals(3)){
//街道
- return R.ok(comSanshuoExpertDao.selectList(new QueryWrapper<ComSanshuoExpert>().lambda().eq(ComSanshuoExpert::getStreetId,loginUserInfoVO.getStreetId())));
+ return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getStreetId()));
}else if(level.equals(4)){
- return R.ok(comSanshuoExpertDao.selectList(new QueryWrapper<ComSanshuoExpert>().lambda().eq(ComSanshuoExpert::getCommunityId,loginUserInfoVO.getCommunityId())));
+ return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getCommunityId()));
}
}
return null;
--
Gitblit v1.7.1