Merge remote-tracking branch 'origin/develop_dl_3.7.0.9' into develop_dl_3.7.0.9

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -3292,9 +3292,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		if ("1601".equals(type)) {
 			deleteFirefighters(id);
 		}
-		//  巡检站端与中心级数据同步
 
+		// 4.解决人员更换岗位类型然后删除，App打卡还有脏数据问题
+		firefightersService.update(new UpdateWrapper<Firefighters>().eq("org_usr_id", id).set("is_delete", 1));
 
+		//  巡检站端与中心级数据同步
 		TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
 			@Override
 			public void afterCommit() {