|
@@ -52,8 +52,8 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private NoticeMapper noticeMapper;
|
|
private NoticeMapper noticeMapper;
|
|
|
|
|
|
|
|
- private static final Logger logger = LoggerFactory.getLogger(UserIdentityServiceImpl.class);
|
|
|
|
|
-
|
|
|
|
|
|
|
+ private static final Logger logger = LoggerFactory.getLogger(UserIdentityServiceImpl.class);
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public UserIdentity selectUserIdentityByUserId(String uid) {
|
|
public UserIdentity selectUserIdentityByUserId(String uid) {
|
|
|
return userIdentityMapper.selectUserIdentityByUserId(uid);
|
|
return userIdentityMapper.selectUserIdentityByUserId(uid);
|
|
@@ -112,7 +112,7 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
|
|
|
if (CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
|
|
if (CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
|
|
|
createAuditorNotice(user);
|
|
createAuditorNotice(user);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
return userIdentityMapper.updateByPrimaryKeySelective(u);
|
|
return userIdentityMapper.updateByPrimaryKeySelective(u);
|
|
|
|
|
|
|
|
}
|
|
}
|
|
@@ -127,9 +127,10 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
|
|
|
createNotice(user, ui.getAuditStatus());
|
|
createNotice(user, ui.getAuditStatus());
|
|
|
}
|
|
}
|
|
|
if (IdentityAuditStatus.PASSED.getCode().equals(ui.getAuditStatus())) {
|
|
if (IdentityAuditStatus.PASSED.getCode().equals(ui.getAuditStatus())) {
|
|
|
- /*if (UserLevel.GENERAL.getCode().equals(level)) {
|
|
|
|
|
- user.setLvl(UserLevel.CERTIFIED.getCode());
|
|
|
|
|
- }*/
|
|
|
|
|
|
|
+ /*
|
|
|
|
|
+ * if (UserLevel.GENERAL.getCode().equals(level)) {
|
|
|
|
|
+ * user.setLvl(UserLevel.CERTIFIED.getCode()); }
|
|
|
|
|
+ */
|
|
|
user.setLvl(UserLevel.CERTIFIED.getCode());
|
|
user.setLvl(UserLevel.CERTIFIED.getCode());
|
|
|
user.setAid(aid);
|
|
user.setAid(aid);
|
|
|
user.setMid(mid);
|
|
user.setMid(mid);
|
|
@@ -273,10 +274,12 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public UserIdentityDetailAdminBo selectUserIdentityByUserIdAdmin(String uid) {
|
|
public UserIdentityDetailAdminBo selectUserIdentityByUserIdAdmin(String uid) {
|
|
|
- UserIdentity ui = userIdentityMapper.selectUserIdentityByUserId(uid);
|
|
|
|
|
|
|
+ UserIdentity ui = userIdentityMapper.selectUserIdentityByUserId(uid);
|
|
|
User u = userMapper.selectByPrimaryKey(uid);
|
|
User u = userMapper.selectByPrimaryKey(uid);
|
|
|
UserIdentityDetailAdminBo bo = new UserIdentityDetailAdminBo();
|
|
UserIdentityDetailAdminBo bo = new UserIdentityDetailAdminBo();
|
|
|
- BeanUtils.copyProperties(ui, bo);
|
|
|
|
|
|
|
+ if (ui != null) {
|
|
|
|
|
+ BeanUtils.copyProperties(ui, bo);
|
|
|
|
|
+ }
|
|
|
bo.setLevel(u.getLvl().toString());
|
|
bo.setLevel(u.getLvl().toString());
|
|
|
return bo;
|
|
return bo;
|
|
|
}
|
|
}
|
|
@@ -286,9 +289,9 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
|
|
|
public List<InternationalListBo> selectInternationalUser(Integer internationalUserCacheKey) {
|
|
public List<InternationalListBo> selectInternationalUser(Integer internationalUserCacheKey) {
|
|
|
return userIdentityMapper.selectInternationalUser();
|
|
return userIdentityMapper.selectInternationalUser();
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
@CacheEvict(value = "internationalUserList", allEntries = true)
|
|
@CacheEvict(value = "internationalUserList", allEntries = true)
|
|
|
- public void cleanInternationalUser(){
|
|
|
|
|
|
|
+ public void cleanInternationalUser() {
|
|
|
LoggerUtils.debug(logger, "清除国际专家列表");
|
|
LoggerUtils.debug(logger, "清除国际专家列表");
|
|
|
}
|
|
}
|
|
|
|
|
|