sweet

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetArtistsServiceImpl.java

@@ -45,8 +45,13 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe
     public ResponseDto<PageInfo<SweetArtists>> getList(int page, int size, String name) {
         PageInfo<SweetArtists> pageInfo = null;
         try {
+            List<SweetArtists> data;
             PageHelper.startPage(page, size);
-            List<SweetArtists> data = sweetArtistsMapper.selectList(Wrappers.lambdaQuery(SweetArtists.class).like(SweetArtists::getName, name));
+            if(name!=null){
+                 data = sweetArtistsMapper.selectList(Wrappers.lambdaQuery(SweetArtists.class).like(SweetArtists::getName, name));
+            }else{
+                 data = sweetArtistsMapper.selectList(Wrappers.lambdaQuery(SweetArtists.class));
+            }
             pageInfo = new PageInfo(data);
             return ResponseDto.success(pageInfo);
         } catch (Exception e) {

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetManualNotifyServiceImpl.java

@@ -38,7 +38,12 @@ public class SweetManualNotifyServiceImpl extends ServiceImpl<SweetManualNotifyM
         PageInfo<SweetManualNotify> pageInfo = null;
         try {
             PageHelper.startPage(page, size);
-            List<SweetManualNotify> data = sweetManualNotifyMapper.selectList(Wrappers.lambdaQuery(SweetManualNotify.class).like(SweetManualNotify::getTitle, title).eq(SweetManualNotify::getManualId, manualId).eq(SweetManualNotify::getStatus, 1));
+            List<SweetManualNotify> data;
+            if (title != null) {
+                data = sweetManualNotifyMapper.selectList(Wrappers.lambdaQuery(SweetManualNotify.class).like(SweetManualNotify::getTitle, title).eq(SweetManualNotify::getManualId, manualId).eq(SweetManualNotify::getStatus, 1));
+            } else {
+                data = sweetManualNotifyMapper.selectList(Wrappers.lambdaQuery(SweetManualNotify.class).eq(SweetManualNotify::getManualId, manualId).eq(SweetManualNotify::getStatus, 1));
+            }
             pageInfo = new PageInfo(data);
             return ResponseDto.success(pageInfo);
         } catch (Exception e) {
@@ -77,7 +82,7 @@ public class SweetManualNotifyServiceImpl extends ServiceImpl<SweetManualNotifyM
     }
 
     @Override
-    public ResponseDto<Boolean> change(String manualId,String manualNotifyId, String title, String content) {
+    public ResponseDto<Boolean> change(String manualId, String manualNotifyId, String title, String content) {
         try {
             SweetManualNotify sweetManualNotify = SweetManualNotify.getNew();
             sweetManualNotify.setTitle(title);
@@ -86,12 +91,12 @@ public class SweetManualNotifyServiceImpl extends ServiceImpl<SweetManualNotifyM
             sweetManualNotifyMapper.update(sweetManualNotify, Wrappers.lambdaUpdate(SweetManualNotify.class).eq(SweetManualNotify::getManualNotifyId, manualNotifyId));
 
             List<SweetManualNotify> oldData = redisDataUtils.getNotifyRedisData(manualId);
-            for (SweetManualNotify item:oldData){
-                    if(item.getManualNotifyId().equalsIgnoreCase(manualNotifyId)){
-                        item.setTitle(title);
-                        item.setContent(content);
-                        item.setUpdatedAt(LocalDateTime.now());
-                    }
+            for (SweetManualNotify item : oldData) {
+                if (item.getManualNotifyId().equalsIgnoreCase(manualNotifyId)) {
+                    item.setTitle(title);
+                    item.setContent(content);
+                    item.setUpdatedAt(LocalDateTime.now());
+                }
             }
             redisDataUtils.setNotifyRedisData(manualId, oldData);
 

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetStageServiceImpl.java

@@ -43,7 +43,12 @@ public class SweetStageServiceImpl extends ServiceImpl<SweetStageMapper, SweetSt
         PageInfo<SweetStage> pageInfo = null;
         try {
             PageHelper.startPage(page, size);
-            List<SweetStage> data = sweetStageMapper.selectList(Wrappers.lambdaQuery(SweetStage.class).like(SweetStage::getTitle, title));
+            List<SweetStage> data;
+            if(title!=null) {
+                data = sweetStageMapper.selectList(Wrappers.lambdaQuery(SweetStage.class).like(SweetStage::getTitle, title));
+            }else{
+                data = sweetStageMapper.selectList(Wrappers.lambdaQuery(SweetStage.class));
+            }
             pageInfo = new PageInfo(data);
             return ResponseDto.success(pageInfo);
         } catch (Exception e) {