优化未包含 relId 错误修复

Api/src/main/java/com/java110/api/listener/users/AddStaffServiceListener.java

@@ -118,6 +118,7 @@ public class AddStaffServiceListener extends AbstractServiceApiDataFlowListener{
         business.put(CommonConstant.HTTP_INVOKE_MODEL,CommonConstant.HTTP_INVOKE_MODEL_S);
         JSONArray businessOrgStaffRels = new JSONArray();
         JSONObject businessOrgStaffRel = new JSONObject();
+        businessOrgStaffRel.put("relId","-1");
         businessOrgStaffRel.put("storeId",paramInJson.getString("storeId"));
         businessOrgStaffRel.put("staffId",paramInJson.getString("userId"));
         businessOrgStaffRel.put("orgId",paramInJson.getString("orgId"));

java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml

@@ -5,167 +5,164 @@
 <mapper namespace="orgStaffRelServiceDaoImpl">
 
     <!-- 保存组织员工关系信息 add by wuxw 2018-07-03 -->
-       <insert id="saveBusinessOrgStaffRelInfo" parameterType="Map">
-           insert into business_org_staff_rel(
-rel_id,operate,store_id,b_id,org_id,staff_id,rel_cd
-) values (
-#{relId},#{operate},#{storeId},#{bId},#{orgId},#{staffId},#{relCd}
-)
-       </insert>
-
-
-       <!-- 查询组织员工关系信息（Business） add by wuxw 2018-07-03 -->
-       <select id="getBusinessOrgStaffRelInfo" parameterType="Map" resultType="Map">
-           select  t.rel_id,t.rel_id relId,t.operate,t.store_id,t.store_id storeId,t.b_id,t.b_id bId,t.org_id,t.org_id orgId,t.staff_id,t.staff_id staffId,t.rel_cd,t.rel_cd relCd 
-from business_org_staff_rel t 
-where 1 =1 
-<if test="relId !=null and relId != ''">
-   and t.rel_id= #{relId}
-</if> 
-<if test="operate !=null and operate != ''">
-   and t.operate= #{operate}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="orgId !=null and orgId != ''">
-   and t.org_id= #{orgId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-   and t.staff_id= #{staffId}
-</if> 
-<if test="relCd !=null and relCd != ''">
-   and t.rel_cd= #{relCd}
-</if> 
-
-       </select>
+    <insert id="saveBusinessOrgStaffRelInfo" parameterType="Map">
+        insert into business_org_staff_rel(
+        rel_id,operate,store_id,b_id,org_id,staff_id,rel_cd
+        ) values (
+        #{relId},#{operate},#{storeId},#{bId},#{orgId},#{staffId},#{relCd}
+        )
+    </insert>
 
 
+    <!-- 查询组织员工关系信息（Business） add by wuxw 2018-07-03 -->
+    <select id="getBusinessOrgStaffRelInfo" parameterType="Map" resultType="Map">
+        select t.rel_id,t.rel_id relId,t.operate,t.store_id,t.store_id storeId,t.b_id,t.b_id bId,t.org_id,t.org_id
+        orgId,t.staff_id,t.staff_id staffId,t.rel_cd,t.rel_cd relCd
+        from business_org_staff_rel t
+        where 1 =1
+        <if test="relId !=null and relId != ''">
+            and t.rel_id= #{relId}
+        </if>
+        <if test="operate !=null and operate != ''">
+            and t.operate= #{operate}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="orgId !=null and orgId != ''">
+            and t.org_id= #{orgId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
+        <if test="relCd !=null and relCd != ''">
+            and t.rel_cd= #{relCd}
+        </if>
 
+    </select>
 
 
     <!-- 保存组织员工关系信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveOrgStaffRelInfoInstance" parameterType="Map">
         insert into u_org_staff_rel(
-rel_id,status_cd,store_id,b_id,org_id,staff_id,rel_cd
-) select t.rel_id,'0',t.store_id,t.b_id,t.org_id,t.staff_id,t.rel_cd from business_org_staff_rel t where 1=1
-<if test="relId !=null and relId != ''">
-   and t.rel_id= #{relId}
-</if> 
-   and t.operate= 'ADD'
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="orgId !=null and orgId != ''">
-   and t.org_id= #{orgId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-   and t.staff_id= #{staffId}
-</if> 
-<if test="relCd !=null and relCd != ''">
-   and t.rel_cd= #{relCd}
-</if> 
+        rel_id,status_cd,store_id,b_id,org_id,staff_id,rel_cd
+        ) select t.rel_id,'0',t.store_id,t.b_id,t.org_id,t.staff_id,t.rel_cd from business_org_staff_rel t where 1=1
+        <if test="relId !=null and relId != ''">
+            and t.rel_id= #{relId}
+        </if>
+        and t.operate= 'ADD'
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="orgId !=null and orgId != ''">
+            and t.org_id= #{orgId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
+        <if test="relCd !=null and relCd != ''">
+            and t.rel_cd= #{relCd}
+        </if>
 
     </insert>
 
 
-
     <!-- 查询组织员工关系信息 add by wuxw 2018-07-03 -->
     <select id="getOrgStaffRelInfo" parameterType="Map" resultType="Map">
-        select  t.rel_id,t.rel_id relId,t.status_cd,t.status_cd statusCd,t.store_id,t.store_id storeId,t.b_id,t.b_id bId,t.org_id,t.org_id orgId,t.staff_id,t.staff_id staffId,t.rel_cd,t.rel_cd relCd 
-from u_org_staff_rel t 
-where 1 =1 
-<if test="relId !=null and relId != ''">
-   and t.rel_id= #{relId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="orgId !=null and orgId != ''">
-   and t.org_id= #{orgId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-   and t.staff_id= #{staffId}
-</if> 
-<if test="relCd !=null and relCd != ''">
-   and t.rel_cd= #{relCd}
-</if> 
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.rel_id,t.rel_id relId,t.status_cd,t.status_cd statusCd,t.store_id,t.store_id storeId,t.b_id,t.b_id
+        bId,t.org_id,t.org_id orgId,t.staff_id,t.staff_id staffId,t.rel_cd,t.rel_cd relCd
+        from u_org_staff_rel t
+        where 1 =1
+        <if test="relId !=null and relId != ''">
+            and t.rel_id= #{relId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="orgId !=null and orgId != ''">
+            and t.org_id= #{orgId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
+        <if test="relCd !=null and relCd != ''">
+            and t.rel_cd= #{relCd}
+        </if>
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改组织员工关系信息 add by wuxw 2018-07-03 -->
     <update id="updateOrgStaffRelInfoInstance" parameterType="Map">
-        update  u_org_staff_rel t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="storeId !=null and storeId != ''">
-, t.store_id= #{storeId}
-</if> 
-<if test="orgId !=null and orgId != ''">
-, t.org_id= #{orgId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-, t.staff_id= #{staffId}
-</if> 
-<if test="relCd !=null and relCd != ''">
-, t.rel_cd= #{relCd}
-</if> 
- where 1=1 <if test="relId !=null and relId != ''">
-and t.rel_id= #{relId}
-</if> 
-<if test="bId !=null and bId != ''">
-and t.b_id= #{bId}
-</if> 
+        update u_org_staff_rel t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            , t.store_id= #{storeId}
+        </if>
+        <if test="orgId !=null and orgId != ''">
+            , t.org_id= #{orgId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            , t.staff_id= #{staffId}
+        </if>
+        <if test="relCd !=null and relCd != ''">
+            , t.rel_cd= #{relCd}
+        </if>
+        where 1=1
+        <if test="relId !=null and relId != ''">
+            and t.rel_id= #{relId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
 
     </update>
 
     <!-- 查询组织员工关系数量 add by wuxw 2018-07-03 -->
-     <select id="queryOrgStaffRelsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from u_org_staff_rel t 
-where 1 =1 
-<if test="relId !=null and relId != ''">
-   and t.rel_id= #{relId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="orgId !=null and orgId != ''">
-   and t.org_id= #{orgId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-   and t.staff_id= #{staffId}
-</if> 
-<if test="relCd !=null and relCd != ''">
-   and t.rel_cd= #{relCd}
-</if> 
-
-
-     </select>
+    <select id="queryOrgStaffRelsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from u_org_staff_rel t
+        where 1 =1
+        <if test="relId !=null and relId != ''">
+            and t.rel_id= #{relId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="orgId !=null and orgId != ''">
+            and t.org_id= #{orgId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
+        <if test="relCd !=null and relCd != ''">
+            and t.rel_cd= #{relCd}
+        </if>
+
+
+    </select>
 
 </mapper>