|
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
-import com.management.platform.controller.WeiXinCorpController;
|
|
|
import com.management.platform.entity.*;
|
|
|
import com.management.platform.entity.vo.DepartmentMasterVO;
|
|
|
import com.management.platform.entity.vo.DepartmentVO;
|
|
@@ -747,7 +746,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
|
|
|
String name;
|
|
|
if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
|
|
|
String corpwxUserId = userList.stream().filter(ul -> ul.getId().equals(key)).findFirst().get().getCorpwxUserid();
|
|
|
- name ="$userName="+corpwxUserId==null?"":corpwxUserId+"$";
|
|
|
+ name ="$userName="+ (corpwxUserId==null?"":corpwxUserId) +"$";
|
|
|
}else {
|
|
|
name = userList.stream().filter(ul -> ul.getId().equals(key)).findFirst().get().getName();
|
|
|
}
|