|
|
@@ -30,35 +30,37 @@ import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import com.goafanti.user.bo.OrgListBo;
|
|
|
+import com.goafanti.user.bo.OrgPartnerDetailBo;
|
|
|
import com.goafanti.user.bo.OrgUnitNames;
|
|
|
import com.goafanti.user.bo.UserDownLoadBo;
|
|
|
import com.goafanti.user.bo.UserListBo;
|
|
|
import com.goafanti.user.bo.UserNames;
|
|
|
import com.goafanti.user.bo.UserPageHomeBo;
|
|
|
+import com.goafanti.user.bo.UserPartnerDetailBo;
|
|
|
import com.goafanti.user.service.UserService;
|
|
|
|
|
|
@Service
|
|
|
public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserService {
|
|
|
@Autowired
|
|
|
- private UserMapper userMapper;
|
|
|
+ private UserMapper userMapper;
|
|
|
@Autowired
|
|
|
- private OrganizationIdentityMapper organizationIdentityMapper;
|
|
|
+ private OrganizationIdentityMapper organizationIdentityMapper;
|
|
|
@Autowired
|
|
|
- private UserIdentityMapper userIdentityMapper;
|
|
|
+ private UserIdentityMapper userIdentityMapper;
|
|
|
@Autowired
|
|
|
- private AdminLocationMapper adminLocationMapper;
|
|
|
+ private AdminLocationMapper adminLocationMapper;
|
|
|
@Autowired
|
|
|
- private PatentInfoMapper patentInfoMapper;
|
|
|
+ private PatentInfoMapper patentInfoMapper;
|
|
|
@Autowired
|
|
|
- private CopyrightInfoMapper copyrightInfoMapper;
|
|
|
+ private CopyrightInfoMapper copyrightInfoMapper;
|
|
|
@Autowired
|
|
|
- private TechProjectMapper techProjectMapper;
|
|
|
+ private TechProjectMapper techProjectMapper;
|
|
|
@Autowired
|
|
|
- private DemandMapper demandMapper;
|
|
|
+ private DemandMapper demandMapper;
|
|
|
@Autowired
|
|
|
- private AchievementMapper achievementMapper;
|
|
|
+ private AchievementMapper achievementMapper;
|
|
|
@Autowired
|
|
|
- private OrgIntellectualPropertyMapper orgIntellectualPropertyMapper;
|
|
|
+ private OrgIntellectualPropertyMapper orgIntellectualPropertyMapper;
|
|
|
|
|
|
@Override
|
|
|
public User insertRegister(User user, String contacts, String unitName) {
|
|
|
@@ -187,7 +189,8 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
|
|
|
if (null != cityList && cityList.size() > 0) {
|
|
|
params.put("cityList", cityList);
|
|
|
}
|
|
|
- return (Pagination<UserListBo>) findPage("findAreaManagerUserListByPage", "findAreaManagerUserCount", params, pageNo, pageSize);
|
|
|
+ return (Pagination<UserListBo>) findPage("findAreaManagerUserListByPage", "findAreaManagerUserCount",
|
|
|
+ params, pageNo, pageSize);
|
|
|
} else if (TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
|
|
|
return (Pagination<UserListBo>) findPage("findUserListByPage", "findUserCount", params, pageNo, pageSize);
|
|
|
}
|
|
|
@@ -252,11 +255,12 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
|
|
|
if (pageSize == null || pageSize < 0) {
|
|
|
pageSize = 10;
|
|
|
}
|
|
|
-
|
|
|
- if (TokenManager.hasRole(AFTConstants.SUPERADMIN)){
|
|
|
+
|
|
|
+ if (TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
|
|
|
return (Pagination<OrgListBo>) findPage("findOrgListByPage", "findOrgCount", params, pageNo, pageSize);
|
|
|
- } else if (TokenManager.hasRole(AFTConstants.AREAADMIN) || TokenManager.hasRole(AFTConstants.MANAGERADMIN)){
|
|
|
- return (Pagination<OrgListBo>) findPage("findAreaManagerOrgListByPage", "findAreaManagerOrgCount", params, pageNo, pageSize);
|
|
|
+ } else if (TokenManager.hasRole(AFTConstants.AREAADMIN) || TokenManager.hasRole(AFTConstants.MANAGERADMIN)) {
|
|
|
+ return (Pagination<OrgListBo>) findPage("findAreaManagerOrgListByPage", "findAreaManagerOrgCount", params,
|
|
|
+ pageNo, pageSize);
|
|
|
}
|
|
|
return null;
|
|
|
}
|
|
|
@@ -337,4 +341,14 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
|
|
|
return userMapper.findOrgByNameAndMobile(name, mobile);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public UserPartnerDetailBo findUserPartnerDetail(String uid) {
|
|
|
+ return userMapper.findUserPartnerDetail(uid);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public OrgPartnerDetailBo findOrgPartnerDetail(String uid) {
|
|
|
+ return userMapper.findOrgPartnerDetail(uid);
|
|
|
+ }
|
|
|
+
|
|
|
}
|