Merge branch 'feature/xgh/bug/0227' into 'master'

Feature/xgh/bug/0227

See merge request !2494

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

@@ -79,6 +79,8 @@ public interface StaffClerkRelationApiService {
 
     StaffClerkRelationDTO getOneByClerkId(String clerkId);
 
+    StaffClerkRelationDTO getOneByClerkId(String clerkId,String wxEnterpriseId);
+
     List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkIds);
 
     List<StaffClerkRelationDTO> listByClerkIdsWxEnterpriseId(List<String> clerkIds, String wxEnterpriseId);

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

@@ -291,6 +291,11 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
     }
 
     @Override
+    public StaffClerkRelationDTO getOneByClerkId(String clerkId,String wxEnterpriseId) {
+        return tabHaobanStaffClerkRelationMapper.getOneByClerkId(clerkId,wxEnterpriseId);
+    }
+
+    @Override
     public StaffClerkRelationDTO getByClerkId(String clerkId) {
         StaffClerkRelationDTO staffRelation = staffClerkRelationService.getByClerkId(clerkId);
         return staffRelation;

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/ContentCreativeController.java

@@ -82,7 +82,7 @@ public class ContentCreativeController {
     @RequestMapping("/save-material")
     public RestResponse<ContentMaterialDTO> saveMaterial(@Validated @RequestBody ContentMaterialSaveQO saveQO) {
         String clerkId = saveQO.getClerkId();
-        StaffDTO staffDTO = clerkStoreAdaptor.queryStaff(clerkId);
+        StaffDTO staffDTO = clerkStoreAdaptor.queryStaff(clerkId,saveQO.getWxEnterpriseId());
         if (staffDTO == null) {
             return RestResponse.failure("-1", "成员不存在");
         }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/adaptor/ClerkStoreAdaptor.java

@@ -66,8 +66,8 @@ public class ClerkStoreAdaptor {
         return storeRole.getStoreCount();
     }
 
-    public StaffDTO queryStaff(String clerkId) {
-        StaffClerkRelationDTO clerkRelationDTO = staffClerkRelationApiService.getByClerkId(clerkId);
+    public StaffDTO queryStaff(String clerkId,String wxEnterpriseId) {
+        StaffClerkRelationDTO clerkRelationDTO = staffClerkRelationApiService.getOneByClerkId(clerkId,wxEnterpriseId);
         if (clerkRelationDTO != null) {
             StaffDTO staffDTO = staffApiService.selectById(clerkRelationDTO.getStaffId());
             return staffDTO;