fix

virgo.api/src/main/java/com/bosshand/virgo/api/operate/model/OperateFlowData.java

@@ -12,6 +12,8 @@ public class OperateFlowData {
 
     private long id;
 
+    private long organizationId;
+
     private long projectId;
 
     private String projectName;
@@ -92,6 +94,14 @@ public class OperateFlowData {
         this.id = id;
     }
 
+    public long getOrganizationId() {
+        return organizationId;
+    }
+
+    public void setOrganizationId(long organizationId) {
+        this.organizationId = organizationId;
+    }
+
     public long getProjectId() {
         return projectId;
     }

virgo.api/src/main/resources/mapper/OperateFlowDataMapper.xml

@@ -6,6 +6,7 @@
 
     <resultMap type="com.bosshand.virgo.api.operate.model.OperateFlowData" id="operateFlowDataResult">
         <id column="id" property="id" />
+        <result column="organizationId" property="organizationId" />
         <result column="projectId" property="projectId" />
         <result column="projectItemId" property="projectItemId" />
         <result column="projectItemTargetId" property="projectItemTargetId" />
@@ -71,6 +72,9 @@
             <if test="ofd.id != 0">
                 and a.id = #{ofd.id}
             </if>
+            <if test="ofd.organizationId != 0">
+                and a.organizationId = #{ofd.organizationId}
+            </if>
             <if test="ofd.projectId != 0">
                 and a.projectId = #{ofd.projectId}
             </if>
@@ -142,6 +146,9 @@
             <if test="ofd.id != 0">
                 and id = #{ofd.id}
             </if>
+            <if test="ofd.organizationId != 0">
+                and organizationId = #{ofd.organizationId}
+            </if>
             <if test="ofd.projectId != 0">
                 and projectId = #{ofd.projectId}
             </if>
@@ -192,22 +199,22 @@
 
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO operate_flow_data(
-            projectId, projectItemId,
+            organizationId, projectId, projectItemId,
             projectItemTargetId, projectItemTargetRoomId,
             deviceLevelId,deviceId, date, projectFlowId, flowUserList, flowData, createdByUserId, document, receiver, attachment, flowType, type)
         VALUES
-            (#{projectId}, #{projectItemId},
+            (#{organizationId}, #{projectId}, #{projectItemId},
              #{projectItemTargetId}, #{projectItemTargetRoomId},
              #{deviceLevelId}, #{deviceId}, now(), #{projectFlowId}, #{flowUserList}, #{flowData}, #{createdByUserId}, #{document}, #{receiver}, #{attachment}, #{flowType}, #{type})
     </insert>
 
     <insert id="batchSave" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO operate_flow_data(
-            projectId, projectItemId,
+            organizationId, projectId, projectItemId,
             projectItemTargetId, projectItemTargetRoomId,
             deviceLevelId,deviceId, date, projectFlowId, flowUserList, flowData, createdByUserId, document, receiver, attachment, flowType, type) VALUES
         <foreach collection ="list" item="item" separator =",">
-            (#{item.projectId}, #{item.projectItemId},
+            (#{item.organizationId},#{item.projectId}, #{item.projectItemId},
              #{item.projectItemTargetId}, #{item.projectItemTargetRoomId},
              #{item.deviceLevelId}, #{item.deviceId}, now(), #{item.projectFlowId}, #{item.flowUserList}, #{item.flowData}, #{item.createdByUserId}, #{item.document}, #{item.receiver}, #{item.attachment},
              #{item.flowType}, #{item.type})
@@ -221,6 +228,7 @@
     <update id="update" parameterType="com.bosshand.virgo.api.operate.model.OperateFlowData">
         UPDATE operate_flow_data
         <trim prefix="set" suffixOverrides=",">
+            <if test="organizationId!=0">organizationId=#{organizationId},</if>
             <if test="projectId!=0">projectId=#{projectId},</if>
             <if test="projectItemId!=0">projectItemId=#{projectItemId},</if>
             <if test="projectItemTargetId!=0">projectItemTargetId=#{projectItemTargetId},</if>