Commit 2dce73198bad319a1ea5161b5b1ce89fa4d50e08

Authored by liwei2917
2 parents 3900e8ca 45c19786

Merge branch 'dev'

src/main/java/com/cnlive/shenhe/job/UsersSiteJob.java
@@ -112,11 +112,14 @@ public class UsersSiteJob { @@ -112,11 +112,14 @@ public class UsersSiteJob {
112 if (shySitesList.isEmpty()) { 112 if (shySitesList.isEmpty()) {
113 shySites.setCompany(company); 113 shySites.setCompany(company);
114 shySites.setName(company_brief); 114 shySites.setName(company_brief);
  115 + shySites.setUpdated_at(CommonUtils.getCurrentTime());
  116 + shySites.setCreated_at(CommonUtils.getCurrentTime());
115 shySitesMapper.insertSelective(shySites); 117 shySitesMapper.insertSelective(shySites);
116 - }else if(CommonUtils.isEmpty(shySitesList.get(0).getCompany()) || CommonUtils.isEmpty(shySitesList.get(0).getName())){ 118 + }else if(CommonUtils.isNotNull(shySitesList.get(0))){
117 shySites = shySitesList.get(0); 119 shySites = shySitesList.get(0);
118 shySites.setCompany(company); 120 shySites.setCompany(company);
119 shySites.setName(company_brief); 121 shySites.setName(company_brief);
  122 + shySites.setUpdated_at(CommonUtils.getCurrentTime());
120 shySitesMapper.updateByPrimaryKeySelective(shySites); 123 shySitesMapper.updateByPrimaryKeySelective(shySites);
121 } 124 }
122 125