Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffClerkRelationApiService.java

@@ -39,7 +39,7 @@ public interface StaffClerkRelationApiService {
 	String delByStoreIdAndCode(String storeId,String clerkCode);
 
 
-	
+	StaffClerkRelationDTO getOneByClerkId(String clerkId);
 	
 	List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkIds);
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffClerkRelationApiServiceImpl.java

 package com.gic.haoban.manage.service.service.out.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+
 import com.alibaba.fastjson.JSONObject;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
@@ -19,6 +20,7 @@ import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
 import com.gic.haoban.manage.service.service.StaffClerkRelationService;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -171,6 +173,11 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 		return b;
 	}
 	@Override
+	public StaffClerkRelationDTO getOneByClerkId(String clerkId) {
+		TabHaobanStaffClerkRelation tab = tabHaobanStaffClerkRelationMapper.getOneByClerkId(clerkId);
+		StaffClerkRelationDTO result = EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class, tab);
+		return result;
+	}
 	public StaffClerkRelationDTO getByClerkId(String clerkId) {
 		StaffClerkRelationDTO staffRelation = staffClerkRelatinService.getByClerkId(clerkId);
 		return staffRelation;