fix

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java

@@ -20,4 +20,6 @@ public interface TabHaobanExternalClerkRelatedMapper {
 	TabHaobanExternalClerkRelated selectByClerkIdAndExternalUserId(@Param("clerkId")String clerkId, @Param("externalUserId")String externalUserId);
 
 	void delByUserIdAndExternalUserId(TabHaobanExternalClerkRelated record);
+
+	void delByClerkIdAndStaffId(@Param("clerkId")String clerkId, @Param("staffId")String staffId);
 }
\ No newline at end of file

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

@@ -9,4 +9,6 @@ public interface ExternalClerkRelatedService {
 
 	void delByUserIdAndExternalUserId(MemberUnionidRelatedDTO dto);
 
+	void delByClerkIdAndStaffId(String clerkId, String staffId);
+
 }

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

@@ -40,4 +40,9 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
 		
 	}
 
+	@Override
+	public void delByClerkIdAndStaffId(String clerkId, String staffId) {
+		mapper.delByClerkIdAndStaffId(clerkId,staffId);
+	}
+
 }

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

@@ -28,6 +28,7 @@ import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
 import com.gic.haoban.manage.service.service.StaffClerkBindLogService;
 import com.gic.haoban.manage.service.service.ClerkMainStoreRelatedService;
+import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
 import com.gic.haoban.manage.service.service.StaffClerkRelationService;
 
 import com.gic.haoban.manage.service.service.StaffService;
@@ -79,6 +80,9 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 
 	@Autowired
 	private StaffService staffService;
+	
+	@Autowired
+	private ExternalClerkRelatedService externalClerkRelatedService;
 
 	@Override
 	public void bindLogMq(String params) {
@@ -354,6 +358,10 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 	}
 
 	private void setMainStore(StaffClerkRelationDTO staffClerkRelation){
+		 if(staffClerkRelation == null){
+			 logger.info("staffClerkRelation为空");
+			 return;
+		 }
 		 String staffId = staffClerkRelation.getStaffId();
 		 String wxEnterpriseId = staffClerkRelation.getWxEnterpriseId();
 		 List<StaffClerkRelationDTO> list = staffClerkRelatinService.lisByStaffId(wxEnterpriseId, staffId);
@@ -363,8 +371,13 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 	}
 
 	private void delSetMainStore(TabHaobanStaffClerkRelation staffClerkRelation){
+		 if(staffClerkRelation == null){
+			 logger.info("staffClerkRelation为空");
+			 return;
+		 }
 		 String staffId = staffClerkRelation.getStaffId();
 		 String wxEnterpriseId = staffClerkRelation.getWxEnterpriseId();
+		 externalClerkRelatedService.delByClerkIdAndStaffId(staffClerkRelation.getClerkId(), staffId);
 		 List<StaffClerkRelationDTO> list = staffClerkRelatinService.lisByStaffId(wxEnterpriseId, staffId);
 		 if(list != null && list.size() >= 1){
 			 clerkMainStoreRelatedService.setMainStore(staffId, list.get(0).getStoreId(), wxEnterpriseId);

haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml

@@ -238,4 +238,14 @@
     and wx_user_id = #{wxUserId}
     and status_flag = 1
   </update>
+  
+  <update id="delByClerkIdAndStaffId" parameterType="com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated" >
+    update tab_haoban_external_clerk_related
+    set
+      status_flag = 2,	 
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where clerk_id = #{clerkId,jdbcType=VARCHAR}
+    and staff_id = #{staffId}
+    and status_flag = 1
+  </update>
 </mapper>
\ No newline at end of file