|
@@ -192,7 +192,14 @@ public class OkrServiceImpl implements OkrService {
|
|
//部门
|
|
//部门
|
|
if(ids.length == 1){
|
|
if(ids.length == 1){
|
|
remind.setRemindType(1);
|
|
remind.setRemindType(1);
|
|
- List<String>wechatIds = qyWxDepartInfoService.getUserIdByDepartId(Long.parseLong(ids[0]));
|
|
|
|
|
|
+ Long departId = Long.parseLong(ids[0]);
|
|
|
|
+ List<String>wechatIds;
|
|
|
|
+ //@所有人
|
|
|
|
+ if(null!=departId&&departId == 10086){
|
|
|
|
+ wechatIds = qyWxDepartInfoService.getAllUserId();
|
|
|
|
+ }else {
|
|
|
|
+ wechatIds = qyWxDepartInfoService.getUserIdByDepartId(Long.parseLong(ids[0]));
|
|
|
|
+ }
|
|
CorpWexinUtils.sendMessage(wechatIds,userName+"在okr中@了你: "+taskInfo.getTaskTitle());
|
|
CorpWexinUtils.sendMessage(wechatIds,userName+"在okr中@了你: "+taskInfo.getTaskTitle());
|
|
}
|
|
}
|
|
if(ids.length == 2){
|
|
if(ids.length == 2){
|
|
@@ -297,7 +304,14 @@ public class OkrServiceImpl implements OkrService {
|
|
//部门
|
|
//部门
|
|
if(ids.length == 1){
|
|
if(ids.length == 1){
|
|
remind.setRemindType(1);
|
|
remind.setRemindType(1);
|
|
- List<String>wechatIds = qyWxDepartInfoService.getUserIdByDepartId(Long.parseLong(ids[0]));
|
|
|
|
|
|
+ Long departId = Long.parseLong(ids[0]);
|
|
|
|
+ List<String>wechatIds;
|
|
|
|
+ //@所有人
|
|
|
|
+ if(null!=departId&&departId == 10086){
|
|
|
|
+ wechatIds = qyWxDepartInfoService.getAllUserId();
|
|
|
|
+ }else {
|
|
|
|
+ wechatIds = qyWxDepartInfoService.getUserIdByDepartId(Long.parseLong(ids[0]));
|
|
|
|
+ }
|
|
if(null!=wechatIds&&!wechatIds.isEmpty()){
|
|
if(null!=wechatIds&&!wechatIds.isEmpty()){
|
|
CorpWexinUtils.sendMessage(wechatIds,username+"在OKR中@你了: "+krInfo.getKrInfo());
|
|
CorpWexinUtils.sendMessage(wechatIds,username+"在OKR中@你了: "+krInfo.getKrInfo());
|
|
}
|
|
}
|
|
@@ -641,7 +655,6 @@ public class OkrServiceImpl implements OkrService {
|
|
String userId = sysUser.getOpenId();
|
|
String userId = sysUser.getOpenId();
|
|
Integer quarter = DateUtils.getQuarter(new Date());
|
|
Integer quarter = DateUtils.getQuarter(new Date());
|
|
Integer year = DateUtils.getYear(new Date());
|
|
Integer year = DateUtils.getYear(new Date());
|
|
-
|
|
|
|
krInfo.setYear(year);
|
|
krInfo.setYear(year);
|
|
krInfo.setQuarter(quarter);
|
|
krInfo.setQuarter(quarter);
|
|
krInfo.setUserId(userId);
|
|
krInfo.setUserId(userId);
|