|
|
@@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletRequest;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+import java.util.Objects;
|
|
|
import java.util.function.Function;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -109,8 +110,9 @@ public class AdminDeptLogic {
|
|
|
|
|
|
IPage<AdminDeptWebsitVO> adminDeptWebsitVOIPage = adminMapper.list(page, zfireParam);
|
|
|
if (isAll && CollectionUtil.isEmpty(adminDeptWebsitVOIPage.getRecords())) {
|
|
|
+ final AdminDept adminDept = adminDeptService.getById(zfireParam.getCurDeptId());
|
|
|
final List<AdminWebsit> websitList = adminWebsitService.lambdaQuery()
|
|
|
- .eq(StringUtils.isNotBlank(zfireParam.getCurDeptId()), AdminWebsit::getCompanyWechatId, zfireParam.getCurDeptId())
|
|
|
+ .eq(Objects.nonNull(adminDept), AdminWebsit::getCompanyWechatId, adminDept.getCompanyWechatId())
|
|
|
.list();
|
|
|
if (CollectionUtil.isNotEmpty(websitList)) {
|
|
|
List<AdminDeptWebsitVO> voList = new ArrayList<>();
|
