commit commit

src/main/java/com/example/afrishop_v3/controllers/AuthController.java

@@ -343,12 +343,16 @@ public class AuthController extends Controller {
     private void fixCode(TbCfUserInfo user) {
 
         if( user.getCode() == null ) {
-            Query nativeQuery = entityManager.createNativeQuery("select b.code as data FROM user_info b where b.external_id=:user limit 1");
+            try {
+                Query nativeQuery = entityManager.createNativeQuery("select b.code as data FROM user_info b where b.external_id=:user limit 1");
 
-            nativeQuery.setParameter("user", user.getUserId());
+                nativeQuery.setParameter("user", user.getUserId());
 
-            if (nativeQuery.getSingleResult() != null) {
-                user.setCode((String) nativeQuery.getSingleResult());
+                if (nativeQuery.getSingleResult() != null) {
+                    user.setCode(nativeQuery.getSingleResult().toString());
+                }
+            }catch (Exception e){
+                System.out.println(e.getMessage());
             }
         }
 

src/main/java/com/example/afrishop_v3/controllers/ItemController.java

@@ -101,8 +101,8 @@ public class ItemController {
 
     @GetMapping("/queryHotRecommended")
     public Result queryHotRecommended() {
-        Page<TbCfRecommend> all = recommendRepository.findAll(PageRequest.of(0, 5));
-        return new Result<>(all.toList().stream().map(TbCfRecommend::getRecommend).collect(Collectors.toList()));
+        List<TbCfRecommend> all = (List<TbCfRecommend>) recommendRepository.findAll();
+        return new Result<>(all.stream().map(TbCfRecommend::getRecommend).collect(Collectors.toList()));
     }
 
 

src/main/java/com/example/afrishop_v3/models/TbCfRecommend.java

 package com.example.afrishop_v3.models;
 
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -16,6 +17,7 @@ import java.util.Date;
  */
 @Entity
 @Data
+@Where(clause = "del_flag=1")
 public class TbCfRecommend{
 
     /**