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

sckw-modules/sckw-system/src/main/java/com/sckw/system/repository/KwsEnterpriseRepository.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sckw.core.model.base.BaseModel;
+import com.sckw.core.model.enums.ApprovalEnum;
 import com.sckw.system.dao.KwsEnterpriseDao;
 import com.sckw.system.model.KwsEnterprise;
 
@@ -31,6 +32,7 @@ public class KwsEnterpriseRepository extends ServiceImpl<KwsEnterpriseDao,KwsEnt
         return list(Wrappers.<KwsEnterprise>lambdaQuery()
                 .eq(BaseModel::getDelFlag, 0)
                 .eq(BaseModel::getStatus, 0)
+                .eq(KwsEnterprise::getApproval, ApprovalEnum.OK.getCode())
                 .eq(StringUtils.isNotBlank(entId), KwsEnterprise::getId, entId)
                 .like(StringUtils.isNotBlank(entName), KwsEnterprise::getFirmName, entName));
     }
@@ -39,6 +41,7 @@ public class KwsEnterpriseRepository extends ServiceImpl<KwsEnterpriseDao,KwsEnt
         return list(Wrappers.<KwsEnterprise>lambdaQuery()
                 .eq(BaseModel::getDelFlag, 0)
                 .eq(BaseModel::getStatus, 0)
+                .eq(KwsEnterprise::getApproval, ApprovalEnum.OK.getCode())
                 .in(KwsEnterprise::getId, entIds)
                 .like(StringUtils.isNotBlank(entName), KwsEnterprise::getFirmName, entName));
     }