|
|
@@ -83,7 +83,7 @@ public class EnterpriseServiceImpl implements EnterpriseService{
|
|
|
if(enterprise != null) {
|
|
|
if(result.equals("ALLOW")) {//审核通过
|
|
|
String encodeString = tokenService.getEncodeToken("enterprise", uu);
|
|
|
- User admin = userDao.findUserByUserUU(enterprise.getEnAdminuu()).get(0);
|
|
|
+ User admin = userDao.findOne(enterprise.getEnAdminuu());
|
|
|
Map<String, Object> model = new HashMap<String, Object>();
|
|
|
model.put("name", enterprise.getEnName());
|
|
|
model.put("email", admin.getUserEmail());
|
|
|
@@ -94,12 +94,13 @@ public class EnterpriseServiceImpl implements EnterpriseService{
|
|
|
"欢迎注册优软管理平台账号", model, "velocity/registerActivate.vm");
|
|
|
return "ALLOW";
|
|
|
} else if(result.equals("NOTALLOW")) {//审核不通过
|
|
|
- User admin = userDao.findUserByUserUU(enterprise.getEnAdminuu()).get(0);
|
|
|
+ User admin = userDao.findOne(enterprise.getEnAdminuu());
|
|
|
enterpriseDao.delete(enterprise);//删除企业记录
|
|
|
userDao.delete(admin);//删除企业管理员记录
|
|
|
Map<String, Object> model = new HashMap<String, Object>();
|
|
|
model.put("name", enterprise.getEnName());
|
|
|
model.put("email", admin.getUserEmail());
|
|
|
+ model.put("rootpath", AgentUtils.getHost(request));
|
|
|
model.put("reason", reason);
|
|
|
sendMailService.sendTemplateMail(admin.getUserEmail(),
|
|
|
"很遗憾账号未能通过审核", model, "velocity/invalid.vm");
|
|
|
@@ -118,7 +119,7 @@ public class EnterpriseServiceImpl implements EnterpriseService{
|
|
|
if(!enterprise.isEnabled()) {
|
|
|
if(tokenService.isCertified("enterprise", uu, checkcode)) {
|
|
|
enterprise.setEnable(Constant.YES);
|
|
|
- User admin = userDao.findUserByUserUU(enterprise.getEnAdminuu()).get(0);
|
|
|
+ User admin = userDao.findOne(enterprise.getEnAdminuu());
|
|
|
admin.setEnable(Constant.YES);
|
|
|
enterprise.setEnStatus((short) Status.ENABLED.value());
|
|
|
enterprise.setEnSendStatus((short) Status.NOT_UPLOAD.value());
|
|
|
@@ -139,7 +140,7 @@ public class EnterpriseServiceImpl implements EnterpriseService{
|
|
|
public String sendActivateEmail(Long enuu, HttpServletRequest request) {
|
|
|
Enterprise enterprise = enterpriseDao.findEnterpriseByUu(enuu);
|
|
|
String encodeString = tokenService.getEncodeToken("enterprise", enuu);
|
|
|
- User admin = userDao.findUserByUserUU(enterprise.getEnAdminuu()).get(0);
|
|
|
+ User admin = userDao.findOne(enterprise.getEnAdminuu());
|
|
|
Map<String, Object> model = new HashMap<String, Object>();
|
|
|
model.put("name", enterprise.getEnName());
|
|
|
model.put("email", admin.getUserEmail());
|