Merge branch 'dev' of licailing/wenlvju into master

src/main/java/com/izouma/wenlvju/repo/RateRepo.java

@@ -28,6 +28,6 @@ public interface RateRepo extends JpaRepository<Rate, Long>, JpaSpecificationExe
 
     Long countAllByOrganizationIdAndYear(@NonNull Long organizationId, String year);
 
-    @Query(nativeQuery = true, value = "select count(1) from rate where expert_user_id = ?1 or find_in_set(?1,expert_member_user_id)")
+    @Query(nativeQuery = true, value = "select count(1) from rate where del=0 and (expert_user_id = ?1 or find_in_set(?1,expert_member_user_id))")
     Long countByExpertId(Long userId);
 }

src/main/java/com/izouma/wenlvju/web/AuthenticationController.java

@@ -1,7 +1,5 @@
 package com.izouma.wenlvju.web;
 
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.date.DateUtil;
 import com.izouma.wenlvju.domain.User;
 import com.izouma.wenlvju.enums.AuthorityName;
 import com.izouma.wenlvju.exception.AuthenticationException;
@@ -22,8 +20,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.Objects;
 
 @Slf4j
@@ -37,16 +33,19 @@ public class AuthenticationController {
 
     @PostMapping("/login")
     public String loginByUserPwd(String username, String password, Integer expiration) {
+//        Authentication authentication = authenticate(username, password);
+//        JwtUser jwtUser = (JwtUser) authentication.getPrincipal();
+//        LocalDate start = Convert.convert(LocalDate.class, "2021-6-2");
+//        if (authentication.getAuthorities()
+//                .contains(new SimpleGrantedAuthority(AuthorityName.ROLE_ADMIN.name()))) {
+//            return jwtTokenUtil.generateToken(jwtUser);
+//        } else if (LocalDate.now().isAfter(start)) {
+//            return jwtTokenUtil.generateToken(jwtUser);
+//        }
+//        throw new AuthenticationException("禁止登录", null);
         Authentication authentication = authenticate(username, password);
         JwtUser jwtUser = (JwtUser) authentication.getPrincipal();
-        LocalDate start = Convert.convert(LocalDate.class, "2021-6-2");
-        if (authentication.getAuthorities()
-                .contains(new SimpleGrantedAuthority(AuthorityName.ROLE_ADMIN.name()))) {
-            return jwtTokenUtil.generateToken(jwtUser);
-        } else if (LocalDate.now().isAfter(start)) {
-            return jwtTokenUtil.generateToken(jwtUser);
-        }
-        throw new AuthenticationException("禁止登录", null);
+        return jwtTokenUtil.generateToken(jwtUser);
 
     }