|
@@ -2,14 +2,12 @@ package cn.com.ctop.okr.controller;
|
|
|
|
|
|
import cn.com.ctop.okr.dto.OkrDto;
|
|
|
import cn.com.ctop.okr.dto.UserInfoDto;
|
|
|
-import cn.com.ctop.okr.entity.OkrContentStatus;
|
|
|
-import cn.com.ctop.okr.entity.OkrKrInfo;
|
|
|
-import cn.com.ctop.okr.entity.OkrObjectInfo;
|
|
|
-import cn.com.ctop.okr.entity.OkrTaskInfo;
|
|
|
+import cn.com.ctop.okr.entity.*;
|
|
|
import cn.com.ctop.okr.service.OkrService;
|
|
|
import cn.com.ctop.okr.vo.Result;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.apache.log4j.Logger;
|
|
|
+import org.apache.shiro.SecurityUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
@@ -187,6 +185,18 @@ public class OkrController {
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
+ //同步人是否重复校验
|
|
|
+ List<UserInfoDto> memberList = okrService.getMemberListByUserId(null);
|
|
|
+ for(String userId:userIdList){
|
|
|
+ for (UserInfoDto memberInfo:memberList){
|
|
|
+ if(StringUtils.equals(userId,memberInfo.getUserId())){
|
|
|
+ result.setSuccess(false);
|
|
|
+ result.setMessage(memberInfo.getName() + "已是同步人,请重新选择");
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
try {
|
|
|
okrService.insertOkrMember2(userIdList);
|
|
|
}catch (Exception e){
|