|
@@ -299,7 +299,6 @@ public class OkrServiceImpl implements OkrService {
|
|
Integer isCurrentQuarter = null;
|
|
Integer isCurrentQuarter = null;
|
|
Map<String, Object> map = new HashMap<>();
|
|
Map<String, Object> map = new HashMap<>();
|
|
//List<List<Map<String, Object>>> list = new ArrayList<>();
|
|
//List<List<Map<String, Object>>> list = new ArrayList<>();
|
|
- List<String> userList = okrMemberMapper.getSyncUserListByMemberId(memberId, year, quarter, name);
|
|
|
|
|
|
|
|
Integer todayQuarter = DateUtils.getQuarter(new Date());
|
|
Integer todayQuarter = DateUtils.getQuarter(new Date());
|
|
Integer todayYear = DateUtils.getYear(new Date());
|
|
Integer todayYear = DateUtils.getYear(new Date());
|
|
@@ -315,6 +314,7 @@ public class OkrServiceImpl implements OkrService {
|
|
isCurrentQuarter = 0;
|
|
isCurrentQuarter = 0;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ List<String> userList = okrMemberMapper.getSyncUserListByMemberId(memberId, year, quarter, name);
|
|
List<Map<String, Object>> mapList = new ArrayList<>();
|
|
List<Map<String, Object>> mapList = new ArrayList<>();
|
|
if(userList!=null && userList.size()!=0){
|
|
if(userList!=null && userList.size()!=0){
|
|
List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoMapper.getAllQuarterObject(userList, year, quarter);
|
|
List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoMapper.getAllQuarterObject(userList, year, quarter);
|