|
|
@@ -112,7 +112,6 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
|
|
|
return userMapper.selectUserDownLoadBoByUserId(id);
|
|
|
}
|
|
|
|
|
|
- @SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<OrgListBo> selectUserByAid(Integer number, String mobile, Integer auditStatus, String auditName,
|
|
|
String email, String aid, String startCreateTime, String endCreateTime, Integer type, Integer pageNo,
|
|
|
@@ -120,17 +119,20 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
|
|
|
if (StringUtils.isNotBlank(startCreateTime)) {
|
|
|
- try {
|
|
|
- params.put("startCreateTime", DateUtils.parseDate(startCreateTime, AFTConstants.YYYYMMDD));
|
|
|
- } catch (ParseException e) {
|
|
|
- }
|
|
|
- }
|
|
|
+ try {
|
|
|
+ params.put("startCreateTime", DateUtils.parseDate(startCreateTime, AFTConstants.YYYYMMDD));
|
|
|
+ } catch (ParseException e) {
|
|
|
+ throw new RuntimeException(e);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
|
|
|
if (StringUtils.isNotBlank(endCreateTime)) {
|
|
|
try {
|
|
|
params.put("endCreateTime",
|
|
|
DateUtils.addDays(DateUtils.parseDate(endCreateTime, AFTConstants.YYYYMMDD), 1));
|
|
|
} catch (ParseException e) {
|
|
|
+ throw new RuntimeException(e);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -231,7 +233,7 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
|
|
|
|
|
|
private Map<String, String> disposeAchievementUserOwner(List<UserNames> list) {
|
|
|
Map<String, String> map = new HashMap<>();
|
|
|
- if (null != list && list.size() > 0) {
|
|
|
+ if (null != list && !list.isEmpty()) {
|
|
|
for (UserNames u : list) {
|
|
|
map.put(u.getUid(), u.getUsername() + " " + u.getMobile());
|
|
|
}
|
|
|
@@ -259,7 +261,6 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
|
|
|
return userMapper.findOrgPartnerDetail(uid);
|
|
|
}
|
|
|
|
|
|
- @SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<StarListBo> listStar(Integer number, String engagedField, String username,
|
|
|
String professionalTitle, String workUnit, Integer pNo, Integer pSize) {
|
|
|
@@ -295,7 +296,6 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
|
|
|
return (Pagination<StarListBo>) findPage("findStarListByPage", "findStarCount", params, pNo, pSize);
|
|
|
}
|
|
|
|
|
|
- @SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<StarAndExpertListBo> listStarAndExpert(Integer number, String engagedField, String username,
|
|
|
String professionalTitle, String workUnit, Integer pNo, Integer pSize) {
|