Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	pz-applet/src/main/java/com/pz/applet/AppletServicesController.java
#	pz-system/src/main/java/com/pz/system/service/impl/ServicesServiceImpl.java

pz-applet/src/main/java/com/pz/applet/AppletServicesController.java

 package com.pz.applet;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.pz.applet.util.CityIdUtils;
 import com.pz.common.annotation.Log;
 import com.pz.common.annotation.RepeatSubmit;
 import com.pz.common.core.controller.BaseController;
@@ -19,7 +18,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;

pz-merchant/src/main/java/com/pz/merchant/controller/applet/CompanyController.java

 package com.pz.merchant.controller.applet;
 
-import cn.dev33.satoken.annotation.SaIgnore;
-import com.dtflys.forest.annotation.Get;
 import com.pz.common.core.controller.BaseController;
 import com.pz.common.core.domain.PageQuery;
 import com.pz.common.core.domain.R;
-import com.pz.common.core.domain.model.LoginUser;
 import com.pz.common.core.validate.EditGroup;
-import com.pz.common.helper.LoginHelper;
 import com.pz.merchant.domain.bo.CompanyBalanceBo;
 import com.pz.merchant.domain.bo.ModifyCompanyInfoBo;
 import com.pz.merchant.domain.vo.CompanyAppVo;

pz-system/src/main/java/com/pz/system/domain/bo/ServicesBo.java

@@ -85,5 +85,4 @@ public class ServicesBo extends BaseEntity {
      */
     private String info;
 
-
 }

pz-system/src/main/java/com/pz/system/service/impl/ServicesServiceImpl.java

 package com.pz.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.pz.common.core.page.TableDataInfo;
 import com.pz.common.core.domain.PageQuery;
@@ -18,7 +17,10 @@ import com.pz.system.domain.Services;
 import com.pz.system.mapper.ServicesMapper;
 import com.pz.system.service.IServicesService;
 
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+import java.util.Optional;
 
 /**
  * 服务Service业务层处理
@@ -49,11 +51,9 @@ public class ServicesServiceImpl implements IServicesService {
     public TableDataInfo<ServicesVo> queryPageList(ServicesBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<Services> lqw = buildQueryWrapper(bo);
         Page<ServicesVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        Optional.ofNullable(result.getRecords()).ifPresent(records -> {
-            List<Notice> notices = noticeMapper.selectList(new LambdaQueryWrapper<Notice>().eq(Notice::getSite, 2));
-            if (null != notices && notices.size() != 0) {
-                records.get(0).setNotice(notices.get(0).getInfo());
-            }
+        result.getRecords().stream().findFirst().ifPresent(service -> {
+            noticeMapper.selectList(new LambdaQueryWrapper<Notice>().eq(Notice::getSite, 2))
+                .stream().findFirst().ifPresent(notices -> service.setNotice(notices.getInfo()));
         });
         return TableDataInfo.build(result);
     }
@@ -73,7 +73,7 @@ public class ServicesServiceImpl implements IServicesService {
         lqw.eq(bo.getBid() != null, Services::getBid, bo.getBid());
         lqw.like(StringUtils.isNotBlank(bo.getName()), Services::getName, bo.getName());
         lqw.eq(StringUtils.isNotBlank(bo.getCover()), Services::getCover, bo.getCover());
-        lqw.eq(ObjectUtils.isNotEmpty(bo.getCityId()), Services::getCityId, bo.getCityId());
+        lqw.eq(bo.getCityId() != null, Services::getCityId, bo.getCityId());
         lqw.eq(bo.getFenmo() != null, Services::getFenmo, bo.getFenmo());
         lqw.eq(bo.getDuration() != null, Services::getDuration, bo.getDuration());
         lqw.eq(bo.getOvertime() != null, Services::getOvertime, bo.getOvertime());
@@ -110,7 +110,7 @@ public class ServicesServiceImpl implements IServicesService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(Services entity) {
+    private void validEntityBeforeSave(Services entity){
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -119,7 +119,7 @@ public class ServicesServiceImpl implements IServicesService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
-        if (isValid) {
+        if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteBatchIds(ids) > 0;