fix

netflix-dao/src/main/java/com/cyksj/model/views/CorpKfDutyServicersStatusView.java

@@ -12,7 +12,9 @@ import lombok.Setter;
 @Getter
 @Setter
 public class CorpKfDutyServicersStatusView {
-	private String nickname;
+	private String name;
+
+	private String followName;
 
 	private Long cmsUserId;
 

netflix-service/src/main/java/com/cyksj/service/corp/kf/impl/CorpKfServiceImpl.java

@@ -11,6 +11,7 @@ import com.cyksj.common.util.Jsons;
 import com.cyksj.config.corp.YHLXWxCorpConfig;
 import com.cyksj.mapper.corp.CorpFollowMapper;
 import com.cyksj.mapper.corp.kf.*;
+import com.cyksj.mapper.manage.cms.CmsUserMapper;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.kf.*;
 import com.cyksj.model.request.corp.kf.CorpKfDutyReq;
@@ -55,6 +56,8 @@ public class CorpKfServiceImpl implements CorpKfService {
 
 	private final CorpKfServicerSessionRecordMapper corpKfServicerSessionRecordMapper;
 
+	private final CmsUserMapper cmsUserMapper;
+
 	@Override
 	public void addKfAccount(CorpKfAccount corpKfAccount) throws Exception {
 		WxCpKfAccountAdd wxCpKfAccountAdd = new WxCpKfAccountAdd();
@@ -246,7 +249,12 @@ public class CorpKfServiceImpl implements CorpKfService {
 				continue;
 			}
 			corpKfDutyServicersStatusView = new CorpKfDutyServicersStatusView();
-			corpKfDutyServicersStatusView.setNickname(corpFollow.getName());
+			Long relateUserId = corpFollow.getCmsUserId();
+			CmsUser cmsUser = cmsUserMapper.selectById(relateUserId);
+			if (cmsUser != null) {
+				corpKfDutyServicersStatusView.setName(cmsUser.getNickname());
+			}
+			corpKfDutyServicersStatusView.setFollowName(corpFollow.getName());
 			corpKfDutyServicersStatusView.setCmsUserId(corpFollow.getCmsUserId());
 			if (!corpKfDutyServiceIds.contains(thisHourDutyFollow)) {
 				//未值班