From d51d68abb91bde7b67e301b9c763b6f5e7226947 Mon Sep 17 00:00:00 2001
From: Qiuyi LI <qiuyi.li@gmail.com>
Date: Thu, 15 May 2025 16:28:09 +0200
Subject: [PATCH] Limit client sku association to active clients

---
 .../java/org/jeecg/modules/business/mapper/ClientMapper.java | 1 +
 .../org/jeecg/modules/business/mapper/xml/ClientMapper.xml   | 5 +++++
 .../org/jeecg/modules/business/service/IClientService.java   | 1 +
 .../modules/business/service/impl/ClientServiceImpl.java     | 4 ++++
 .../modules/business/service/impl/ClientSkuServiceImpl.java  | 2 +-
 .../business/service/impl/SkuListMabangServiceImpl.java      | 2 +-
 6 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/ClientMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/ClientMapper.java
index 409198431..f8ae566f5 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/ClientMapper.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/ClientMapper.java
@@ -20,6 +20,7 @@ public interface ClientMapper extends BaseMapper<Client> {
     String getClientEntity(@Param("id") String id);
     Map<String, String> getClientsEntity(@Param("ids") List<String> ids);
     String getClientIdByCode(@Param("code") String code);
+    String getActiveClientIdByCode(@Param("code") String code);
     List<Client> getClientByType(@Param("type") String type);
     Client getClientByCode(@Param("code") String internalCode);
     Client getClientFromOrder(@Param("orderId")String orderId);
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ClientMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ClientMapper.xml
index 4903b03a9..e839e9421 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ClientMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ClientMapper.xml
@@ -24,6 +24,11 @@
     FROM client
         WHERE internal_code = #{code}
 </select>
+    <select id="getActiveClientByCode" parameterType="java.lang.String" resultType="org.jeecg.modules.business.entity.Client">
+        SELECT *
+        FROM client
+        WHERE internal_code = #{code} AND active = 1
+    </select>
     <select id="getClientByType" resultType="org.jeecg.modules.business.entity.Client">
         SELECT c.*
         FROM client c
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IClientService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IClientService.java
index eb65e3f16..25786bd08 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IClientService.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IClientService.java
@@ -41,6 +41,7 @@ public interface IClientService extends IService<Client> {
 	public String getClientEntity(String id);
 	public Map<String, String> getClientsEntity(List<String> ids);
 	public String getClientIdByCode(String code);
+	public String getActiveClientIdByCode(String code);
 	/**
 	 * Get current user's client information
 	 * @return client or null if current user's role is not client
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ClientServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ClientServiceImpl.java
index 69cf16322..8f4f14fc6 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ClientServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ClientServiceImpl.java
@@ -161,6 +161,10 @@ public class ClientServiceImpl extends ServiceImpl<ClientMapper, Client> impleme
     public String getClientIdByCode(String code) {
         return clientMapper.getClientIdByCode(code);
     }
+    @Override
+    public String getActiveClientIdByCode(String code) {
+        return clientMapper.getActiveClientIdByCode(code);
+    }
 
     @Override
     public void anonymizePersonalData(int directClientAnonymizationPeriod) {
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ClientSkuServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ClientSkuServiceImpl.java
index 347f5ea2f..9a967b510 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ClientSkuServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ClientSkuServiceImpl.java
@@ -49,7 +49,7 @@ public class ClientSkuServiceImpl extends ServiceImpl<ClientSkuMapper, ClientSku
 				continue;
 			}
 			String internalCode = erpCode.substring(index+1);
-			String clientId = clientService.getClientIdByCode(internalCode);
+			String clientId = clientService.getActiveClientIdByCode(internalCode);
             if (clientId != null) {
 				log.info("Associating sku \"{}\" with client \"{}\" : \"{}\". ", sku.getErpCode(), internalCode, clientId);
 				addClientSku(clientId, sku.getId());
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java
index c88bf53ed..3c0d241d7 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java
@@ -410,7 +410,7 @@ public class SkuListMabangServiceImpl extends ServiceImpl<SkuListMabangMapper, S
                     s.setZhName(skuData.getNameCN());
                 }
             }
-            if(skuData.getStockPicture().equals("") || skuData.getStockPicture() == null) {
+            if(skuData.getStockPicture() == null || skuData.getStockPicture().isEmpty()) {
                 s.setImageSource(skuData.getSalePicture());
             }
             else {