|
|
@@ -1,11 +1,12 @@
|
|
|
package com.goafanti.customer.service.impl;
|
|
|
|
|
|
-import com.goafanti.common.constant.AFTConstants;
|
|
|
import com.goafanti.common.dao.UserArchivesMapper;
|
|
|
+import com.goafanti.common.dao.UserLimitCheckMapper;
|
|
|
import com.goafanti.common.dao.UserMapper;
|
|
|
import com.goafanti.common.model.OrganizationContactBook;
|
|
|
import com.goafanti.common.model.User;
|
|
|
import com.goafanti.common.model.UserArchives;
|
|
|
+import com.goafanti.common.model.UserLimitCheck;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
@@ -35,6 +36,8 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
|
|
|
private CustomerService customerService;
|
|
|
@Resource
|
|
|
private UserMapper userMapper;
|
|
|
+ @Resource
|
|
|
+ private UserLimitCheckMapper userLimitCheckMapper;
|
|
|
|
|
|
|
|
|
@Override
|
|
|
@@ -71,11 +74,11 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
|
|
|
User user = userMapper.selectByPrimaryKey(id);
|
|
|
if (user.getAid().equals(TokenManager.getAdminId())){
|
|
|
return false;
|
|
|
- }else {
|
|
|
- if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)&&!TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)
|
|
|
- &&!TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
|
|
|
- return true;
|
|
|
- }
|
|
|
+ }
|
|
|
+ UserLimitCheck userLimitCheck = userLimitCheckMapper.selectByUid(id);
|
|
|
+
|
|
|
+ if (userLimitCheck==null||userLimitCheck.getCheckTime().getTime()>System.currentTimeMillis()) {
|
|
|
+ return false;
|
|
|
}
|
|
|
return true;
|
|
|
}
|