|
@@ -195,14 +195,14 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
|
|
QueryAuthProgressDTO queryAuthProgressDTO = new QueryAuthProgressDTO();
|
|
QueryAuthProgressDTO queryAuthProgressDTO = new QueryAuthProgressDTO();
|
|
queryAuthProgressDTO.setUserStatus(user.getAuthStatus());
|
|
queryAuthProgressDTO.setUserStatus(user.getAuthStatus());
|
|
queryAuthProgressDTO.setUserStatusMsg(AuthStatusEnum.getName(user.getAuthStatus()));
|
|
queryAuthProgressDTO.setUserStatusMsg(AuthStatusEnum.getName(user.getAuthStatus()));
|
|
- if(userAuthentication!=null){
|
|
|
|
- queryAuthProgressDTO.setIsReject(userAuthentication.getIsReject());
|
|
|
|
- if(userAuthentication.getRejectType()!=null){
|
|
|
|
- queryAuthProgressDTO.setRejectType(AccdenEnum.getName(userAuthentication.getRejectType()));
|
|
|
|
- }
|
|
|
|
- queryAuthProgressDTO.setRejectComment(userAuthentication.getRejectComment());
|
|
|
|
|
|
+ if (userAuthentication != null) {
|
|
|
|
+ queryAuthProgressDTO.setIsReject(userAuthentication.getIsReject());
|
|
|
|
+ if (userAuthentication.getRejectType() != null) {
|
|
|
|
+ queryAuthProgressDTO.setRejectType(AccdenEnum.getName(userAuthentication.getRejectType()));
|
|
|
|
+ }
|
|
|
|
+ queryAuthProgressDTO.setRejectComment(userAuthentication.getRejectComment());
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
|
|
|
|
return queryAuthProgressDTO;
|
|
return queryAuthProgressDTO;
|
|
}
|
|
}
|
|
@@ -241,7 +241,11 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
|
|
*/
|
|
*/
|
|
public WaitAuthenDTO waitAuthen() {
|
|
public WaitAuthenDTO waitAuthen() {
|
|
WaitAuthenDTO waitAuthenDTO = new WaitAuthenDTO();
|
|
WaitAuthenDTO waitAuthenDTO = new WaitAuthenDTO();
|
|
- waitAuthenDTO.setCount(baseMapper.getAllWaitAuthCou());
|
|
|
|
|
|
+ QueryWrapper<User> qw = new QueryWrapper<>();
|
|
|
|
+ qw.eq("is_deleted", IsDeleteEnum.N.getKey()).
|
|
|
|
+ eq("auth_status", AuthStatusEnum.Authorizing.getKey());
|
|
|
|
+ Integer count = userFacade.list(qw).size();
|
|
|
|
+ waitAuthenDTO.setCount(count);
|
|
return waitAuthenDTO;
|
|
return waitAuthenDTO;
|
|
}
|
|
}
|
|
}
|
|
}
|