admin

src/main/java/com/smcic/api/admin/service/impl/LeadersServiceImpl.java

@@ -12,6 +12,7 @@ import com.smcic.api.admin.service.ILeadersService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.smcic.api.admin.service.OSSService;
 import com.smcic.core.advice.APIException;
+import org.apache.http.util.TextUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -62,8 +63,9 @@ public class LeadersServiceImpl extends ServiceImpl<LeadersMapper, Leaders> impl
     public Page<Leaders> pageList(OrganPageDTO namePageDTO){
         LambdaQueryWrapper<Leaders> lambdaQueryWrapper = Wrappers.lambdaQuery();
         return baseMapper.selectPage(new Page<>(namePageDTO.getPage(), namePageDTO.getPageSize()),
-                lambdaQueryWrapper.eq(namePageDTO.getRegionId() > 0, Leaders::getRegionId, namePageDTO.getRegionId())
-                        .eq(namePageDTO.getOrganId() > 0, Leaders::getOrganId, namePageDTO.getOrganId())
+                lambdaQueryWrapper.eq(namePageDTO.getRegionId()!= null && namePageDTO.getRegionId() > 0, Leaders::getRegionId, namePageDTO.getRegionId())
+                        .eq(namePageDTO.getOrganId() != null && namePageDTO.getOrganId() > 0, Leaders::getOrganId, namePageDTO.getOrganId())
+                        .eq(!TextUtils.isEmpty(namePageDTO.getName()), Leaders::getName, namePageDTO.getName())
                         .orderByAsc(Leaders::getSort)
         );