|
|
@@ -10,6 +10,7 @@ import com.minto.app.behavior.manager.IBehManager;
|
|
|
import com.minto.app.collaboration.bo.ColAffairBO;
|
|
|
import com.minto.app.message.beans.MessageBean;
|
|
|
import com.minto.app.message.enums.MessageEnum;
|
|
|
+import com.minto.app.message.enums.MessageResourceTypeEnum;
|
|
|
import com.minto.app.message.manager.MessageService;
|
|
|
import com.minto.app.organization.OrgEnum;
|
|
|
import com.minto.app.organization.beans.OrgPersonBean;
|
|
|
@@ -157,7 +158,7 @@ public final class TaskKaizhouUtil{
|
|
|
Integer category = OrgEnum.OrgRelationCategoryEnum.Secretary.getKey();
|
|
|
IOrgManager orgManager = ApplicationContextHolder.getBean(IOrgManager.class);
|
|
|
List<OrgRelationBean> relationBeans = orgManager.findOrgRelation(person, lingdaoId, person, (Long)null, category, (EnumMap<RelationValueName, Object>)null, (Long)null);
|
|
|
- return CollectionUtil.isNotEmpty(relationBeans)?relationBeans.get(0).getId():null;
|
|
|
+ return CollectionUtil.isNotEmpty(relationBeans)?relationBeans.get(0).getTargetId():null;
|
|
|
} else {
|
|
|
return null;
|
|
|
}
|
|
|
@@ -183,7 +184,7 @@ public final class TaskKaizhouUtil{
|
|
|
messageBean.setReceiverId(clerkId);
|
|
|
messageBean.setMessage(content);
|
|
|
messageBean.setResourceId(taskId);
|
|
|
- messageBean.setResourceType(ResourceEnum.ResourceTypeEnum.Task.getKey());
|
|
|
+ messageBean.setResourceType(MessageResourceTypeEnum.Comment.getKey());// 这个值应该用哪个枚举不清楚，但是知道是它
|
|
|
messageBean.setOrgCorporationId(AppContext.currentLoginCorporation());
|
|
|
msgManager.sendMessage(messageBean);
|
|
|
}
|
