From 1ef16a9bc58119160334e5a3b448f7b18f9bd78b Mon Sep 17 00:00:00 2001
From: 623756217 <623756217@qq.com>
Date: Fri, 30 Dec 2022 16:49:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=8D=E7=B1=BB/=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/market/MarketController.java   |   4 ++--
 .../service/market/impl/MarketService.java    |  12 ++++++++++--
 .../controller/market/MarketController.class  | Bin 5057 -> 4999 bytes
 .../service/market/impl/MarketService.class   | Bin 9621 -> 10266 bytes
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gitlink/softbot/controller/market/MarketController.java b/src/main/java/com/gitlink/softbot/controller/market/MarketController.java
index 3606cca..6611b35 100644
--- a/src/main/java/com/gitlink/softbot/controller/market/MarketController.java
+++ b/src/main/java/com/gitlink/softbot/controller/market/MarketController.java
@@ -96,8 +96,8 @@ public class MarketController {
      * @throws BotException
      */
     @GetMapping("/getContentsLikeNameAndFunc")
-    public Result<MarketBotPagesVO> getContentsLikeNameAndFunc(@RequestParam("name") String keyword,
-                                                      @RequestParam("func") String func,
+    public Result<MarketBotPagesVO> getContentsLikeNameAndFunc(@RequestParam(value = "name",required = false) String keyword,
+                                                      @RequestParam(value= "func", required = false) String func,
                                                       @RequestParam(value = "page_no",defaultValue = "1",required = false) Integer pageIndex,
                                                       @RequestParam(value = "page_size",defaultValue = "12",required = false) Integer pageSize) throws BotException{
         MarketBotPagesVO marketBotPagesVO = marketService.getContentsLikeNameAndFunc(keyword,func,pageIndex,pageSize);
diff --git a/src/main/java/com/gitlink/softbot/service/market/impl/MarketService.java b/src/main/java/com/gitlink/softbot/service/market/impl/MarketService.java
index 2cfbb25..c1722b9 100644
--- a/src/main/java/com/gitlink/softbot/service/market/impl/MarketService.java
+++ b/src/main/java/com/gitlink/softbot/service/market/impl/MarketService.java
@@ -230,8 +230,15 @@ public class MarketService implements IMarketService {
     @Override
     public MarketBotPagesVO getContentsLikeNameAndFunc(String name, String fun, Integer pageNo, Integer pageSize) {
         LambdaQueryWrapper<MarketBot> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(StringUtils.isNotBlank(fun),MarketBot::getFirstFunc,fun);
-        lambdaQueryWrapper.like(StringUtils.isNotBlank(name),MarketBot::getMarketName,name);
+        if(StringUtils.isNotBlank(fun)){
+            lambdaQueryWrapper.and(wrapper->{
+                wrapper.eq(StringUtils.isNotBlank(fun),MarketBot::getFirstFunc,fun)
+                        .or().eq(StringUtils.isNotBlank(fun),MarketBot::getSecondFunc,fun);
+            });
+        }
+        if(StringUtils.isNotBlank(name)){
+            lambdaQueryWrapper.like(StringUtils.isNotBlank(name),MarketBot::getMarketName,name);
+        }
         lambdaQueryWrapper.orderByDesc(MarketBot::getInstallNum);
         IPage<MarketBot> page = marketBotMapper.selectPage(new Page<MarketBot>(pageNo,pageSize),lambdaQueryWrapper);
         MarketBotPagesVO marketBotPagesVO = new MarketBotPagesVO();
@@ -241,4 +248,5 @@ public class MarketService implements IMarketService {
         marketBotPagesVO.setPageSize(pageSize);
         return marketBotPagesVO;
     }
+
 }
diff --git a/target/classes/com/gitlink/softbot/controller/market/MarketController.class b/target/classes/com/gitlink/softbot/controller/market/MarketController.class
index 7f8c3bd12076b6415072150072456bbfbd1ecb48..2520eedb3828edf83ce396dfeaa74b2beaee4e49 100644
GIT binary patch
delta 411
zcmZvW$xZ@66h%*U3*EF86~s7gBuX@KslkQpTp3iHaA+Jr#CdLUo?Z9>{UyrIg^62#
z!Y|QSMKEq$)P3(%-S=+2cRzKzAK$NUKtGQT5teM0LxjmW<XNeuz^X;jA;^-JHGRFV
zyA7L7UAMGnTg#4?T`hYS`xXb!Zom|W<(%1O222$p$``>eqf^pMi@?l#tCB{d7Dp0~
zV~djHgi}G6fA6&W4R$CYIpbV%!KLo51h!Wy6pEe~(|j$t;Z`!log~e@B*TLsp~j=-
zVJBtv#0&%j7{okA7<3u^<1x)i#c9U<mvGTcGvT*I+T)YT->3d-Fh!H9b;{GBPArS?
ym{whe8Q+b3CTIV7pCh4WQZ>p}4W9oEs&c%-{y}|jtASey%2pORDsn;bBK!c5e?W@>

delta 484
zcmZvWNlzO=5QV><0go{qWQ-9gilSHof!GcKnKSY&5JP}0n9Tz-7zbk~(_<j)O9<qO
ze+lv}he)~RPvn;*O1FjJLQD1P)vKzmch&c+FZcW3kDtI8-(w{3qWCSevk{}fW-CQL
zI&8&=;29_xdE2mZl#0op%*<y4fdOS8bf`M)+~%5Xv0KmEPwo0i<geuk+A2Y@P%O{5
zVdw{CB@hFGxLYb!b~AzR`Q@<ambBay2321W*>?9P3VyTpr(auK(nYtxc9kdTAnC9t
z`NF=#f#i@QLC=ldla?HFB01&Euya9FRoB;jrBbH8kbLD*lHr>q%avrFYeD+PPS&5q
zCY|S97J_jdDaF(SeXVJh>Dp<#pUE<#s{~1g7{+2m+mrXo8?B6L#bTCDV_bJ$=twOh
z6my!*^S0KX`1A7JBmMWJ_0B|-9=kK~;eqzna`C}Ii-pGbxyJf4eP~hFOV}(oPOPx1
J$m70Z?LWn7Q3?P6

diff --git a/target/classes/com/gitlink/softbot/service/market/impl/MarketService.class b/target/classes/com/gitlink/softbot/service/market/impl/MarketService.class
index e26e2e31c49cf0c41c97207dd3ab218929dc4672..31623a70f6c720c3d13225e96de84d5b406b05a3 100644
GIT binary patch
delta 3524
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
Nj#E(RZSM5le*ms6<lX=P

delta 3032
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