Merge branch 'feature-haoban-role' into 'master'

导购

See merge request !323

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

@@ -488,11 +488,16 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
             }
         } else if (type == 2) {
             logger.info("导购门店转移,新的导购和门店,clerkId={},storeId={}", clerkId, clerkSyncQDTO.getStoreId());
-            StaffClerkRelationDTO oldRelationDTO = staffClerkRelationService.getByClerkId(oldClerkId);
+            StaffClerkRelationDTO oldRelationDTO = staffClerkRelationService.getByCodeAndEnterpriseId(clerkCode,enterpriseId);
             if (null == oldRelationDTO) {
-                logger.info("导购未关联成员,clerkCode={}", clerkCode);
+                logger.info("导购未关联成员,clerkCode={}",clerkCode);
                 return;
             }
+           /* StaffClerkRelationDTO oldRelationDTO = staffClerkRelationService.getByClerkId(oldClerkId);
+            if (null == oldRelationDTO) {
+                logger.info("导购未关联成员,clerkCode={}", clerkCode);
+                return;
+            }*/
             logger.info("导购门店转移,老的绑定导购id={}", oldRelationDTO.getClerkId());
             this.moveOrAddClerk(clerkSyncQDTO, oldRelationDTO);
         } else if (type == 3) {