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

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/controller/PartnerAddressController.java

@@ -2,10 +2,12 @@ package org.dromara.customer.controller;
 
 import java.util.List;
 
+import cn.hutool.core.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -43,6 +45,10 @@ public class PartnerAddressController extends BaseController {
     //@SaCheckPermission("partnerAddress:partaddress:list")
     @GetMapping("/list")
     public TableDataInfo<PartnerAddressVo> list(PartnerAddressBo bo, PageQuery pageQuery) {
+        Long partnerId = LoginHelper.getLoginUser().getPartnerId();
+        if (ObjectUtil.isNotEmpty(partnerId)) {
+            bo.setPartnerId(partnerId);
+        }
         return partnerAddressService.queryPageList(bo, pageQuery);
     }
 
@@ -65,7 +71,7 @@ public class PartnerAddressController extends BaseController {
     //@SaCheckPermission("partnerAddress:partaddress:query")
     @GetMapping("/{id}")
     public R<PartnerAddressVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable("id") Long id) {
+                                       @PathVariable("id") Long id) {
         return R.ok(partnerAddressService.queryById(id));
     }
 

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/controller/SupplierAddressController.java

@@ -2,10 +2,12 @@ package org.dromara.customer.controller;
 
 import java.util.List;
 
+import cn.hutool.core.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -43,8 +45,13 @@ public class SupplierAddressController extends BaseController {
     //@SaCheckPermission("supplierAddress:supplieraddress:list")
     @GetMapping("/supplierAddressById")
     public R<List<SupplierAddressVo>> list(SupplierAddressBo bo) {
+        Long supplierId = LoginHelper.getLoginUser().getSupplierId();
+        if (ObjectUtil.isNotEmpty(supplierId)) {
+            bo.setSupplierId(supplierId);
+        }
         return R.ok(supplierAddressService.getSupplierAddressById(bo));
     }
+
     /**
      * 查询供应商地址列表
      */
@@ -73,7 +80,7 @@ public class SupplierAddressController extends BaseController {
     //@SaCheckPermission("supplierAddress:supplieraddress:query")
     @GetMapping("/{id}")
     public R<SupplierAddressVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable("id") Long id) {
+                                        @PathVariable("id") Long id) {
         return R.ok(supplierAddressService.queryById(id));
     }
 

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/impl/PartnerAddressServiceImpl.java

@@ -39,7 +39,7 @@ import org.dromara.customer.domain.bo.PartnerAddressBo;
 @Slf4j
 @RequiredArgsConstructor
 @Service
-public class PartnerAddressServiceImpl  extends ServiceImpl<PartnerAddressMapper, PartnerAddress> implements IPartnerAddressService {
+public class PartnerAddressServiceImpl extends ServiceImpl<PartnerAddressMapper, PartnerAddress> implements IPartnerAddressService {
 
     private final PartnerAddressMapper baseMapper;
 
@@ -54,12 +54,12 @@ public class PartnerAddressServiceImpl  extends ServiceImpl<PartnerAddressMapper
      * @return 伙伴商地址
      */
     @Override
-    public PartnerAddressVo queryById(Long id){
+    public PartnerAddressVo queryById(Long id) {
         PartnerAddressVo partnerAddressVo = baseMapper.selectVoById(id);
-       if (partnerAddressVo != null && partnerAddressVo.getPartnerId() != null) {
+        if (partnerAddressVo != null && partnerAddressVo.getPartnerId() != null) {
             // 根据 partnerId 查询伙伴商名称
             PartnerInfoVo partnerInfoVo = partnerInfoMapper.selectVoById(partnerAddressVo.getPartnerId());
-           if (partnerInfoVo != null) {
+            if (partnerInfoVo != null) {
                 partnerAddressVo.setPartnerName(partnerInfoVo.getPartnerName());
             }
         }
@@ -104,6 +104,7 @@ public class PartnerAddressServiceImpl  extends ServiceImpl<PartnerAddressMapper
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<PartnerAddress> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(PartnerAddress::getId);
+        lqw.eq(bo.getPartnerId() != null, PartnerAddress::getPartnerId, bo.getPartnerId());
         lqw.eq(StringUtils.isNotBlank(bo.getPartnerNo()), PartnerAddress::getPartnerNo, bo.getPartnerNo());
         return lqw;
     }
@@ -175,7 +176,7 @@ public class PartnerAddressServiceImpl  extends ServiceImpl<PartnerAddressMapper
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(PartnerAddress entity){
+    private void validEntityBeforeSave(PartnerAddress entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -188,7 +189,7 @@ public class PartnerAddressServiceImpl  extends ServiceImpl<PartnerAddressMapper
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-       if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验，判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;
@@ -200,7 +201,7 @@ public class PartnerAddressServiceImpl  extends ServiceImpl<PartnerAddressMapper
      * @param records 伙伴商地址列表
      */
     private void batchSetPartnerName(List<PartnerAddressVo> records) {
-       if (records == null || records.isEmpty()) {
+        if (records == null || records.isEmpty()) {
             return;
         }
 
@@ -210,7 +211,7 @@ public class PartnerAddressServiceImpl  extends ServiceImpl<PartnerAddressMapper
             .filter(id -> id != null)
             .collect(Collectors.toSet());
 
-       if (partnerIds.isEmpty()) {
+        if (partnerIds.isEmpty()) {
             return;
         }
 
@@ -231,8 +232,8 @@ public class PartnerAddressServiceImpl  extends ServiceImpl<PartnerAddressMapper
         // 4. 赋值
         for (PartnerAddressVo record : records) {
             Long partnerId = record.getPartnerId();
-           if (partnerId != null) {
-               String partnerName = partnerIdToNameMap.get(partnerId);
+            if (partnerId != null) {
+                String partnerName = partnerIdToNameMap.get(partnerId);
                 record.setPartnerName(partnerName != null ? partnerName : "");
             } else {
                 record.setPartnerName("");

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCompany.java

@@ -82,6 +82,11 @@ public class SysCompany extends TenantEntity {
      */
     private Date registrationDate;
 
+    /**
+     * 审核状态 0待审核 1已审核
+     */
+    private String checkStatus;
+
     /**
      * 是否显示
      */