From d4500ecb83b76fe5f5a51cc160447092e1fc416f Mon Sep 17 00:00:00 2001
From: tyty <hello>
Date: Tue, 18 Apr 2023 11:06:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=92=E7=8F=AD-=E7=81=B5?=
 =?UTF-8?q?=E6=B4=BB=E6=8E=92=E7=8F=AD=E6=A8=A1=E6=9D=BF=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
index 6e4c22d..01c3bfa 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java
@@ -928,10 +928,13 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 		if (1 == vo.getPersonType()) {
 			String dutyOrderIds = JSONObject.toJSONString(vo.getDutyOrderIds(), SerializerFeature.WriteMapNullValue);
 			entity.setDutyOrderIds(dutyOrderIds);
+			entity.setFlexible(null);
 			entity.setType(1);
 		} else {
 			String flexible = JSONObject.toJSONString(vo.getFlexible(), SerializerFeature.WriteMapNullValue);
 			entity.setFlexible(flexible);
+			String dutyOrderIds = JSONObject.toJSONString(vo.getDutyOrderIds(), SerializerFeature.WriteMapNullValue);
+			entity.setDutyOrderIds(dutyOrderIds);
 			entity.setType(2);
 		}
 		String dutyArrIds = JSONObject.toJSONString(vo.getDutyArrIds(), SerializerFeature.WriteMapNullValue);