Merge remote-tracking branch 'origin/developer' into developer

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

@@ -75,5 +75,11 @@ public interface StaffClerkRelationApiService {
 	 * @return
 	 */
 	StaffClerkRelationDTO getByClerkId(String clerkId);
+	
+	/**
+	 * 删除关联关系
+	 * @param clerkId
+	 */
+	void delByClerkId(String clerkId);
 
 }

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

@@ -243,6 +243,8 @@ public class AuditApiServiceImpl implements AuditApiService{
 			if(org.apache.commons.lang.StringUtils.isNotBlank(batchId)){
 				 insertBatchLog( batchId,AuditRsultType.success.getCode(),tab);
 			}
+			staffClerkRelationApiService.delByClerkId(obj.getClerkId());
+			
 			staffDepartmentRelatedApiService.sendClerkDel(obj.getClerkName(), obj.getClerkCode(),tab.getCommitStoreId(), 1, "");
 		}else if(auditType == AuditType.CLERK_UNBIND.getCode()){
 			//解绑申请，无需审核，直接通过
@@ -281,7 +283,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 			staffDepartmentRelatedApiService.sendClerkAdd(enterpriseId, obj.getClerkCode(), 2, auditReason);
 		}else if(auditType == AuditType.CLERK_DEL.getCode()) {
 			AuditStaffDTO obj = JSONObject.parseObject(oldValue,AuditStaffDTO.class);
-			staffDepartmentRelatedApiService.sendClerkDel(obj.getClerkName(), obj.getClerkCode(),tab.getCommitStoreId(), 2, auditReason);
+			staffDepartmentRelatedApiService.sendClerkDel(obj.getClerkName(), obj.getClerkCode(),tab2.getCommitStoreId(), 2, auditReason);
 		}
 	}
 	@Override

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

@@ -211,4 +211,8 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 			 staffClerkRelatinService.insert(staffClerkRelation);
 		}		
 	}
+	@Override
+	public void delByClerkId(String clerkId) {
+		
+	}
 }

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

@@ -297,6 +297,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
         ClerkDTO gicClerk = clerkService.getClerkLeaderByStoreId(storeId);
 		if(gicClerk == null){
 			logger.info("店长不存在，发送消息失败{}",storeId);
+			return ;
 		}
 		TabHaobanStaffClerkRelation tab = tabHaobanStaffClerkRelationMapper.getOneByClerkId(gicClerk.getClerkId());
 		if(tab == null){

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

@@ -389,8 +389,8 @@
 	    select 
 	    <include refid="Base_Column_List" />
 	    from tab_haoban_audit
-	    where 1=1
-			and commit_store_id = #{storeId,jdbcType=VARCHAR}
+	    where 
+			 commit_store_id = #{storeId,jdbcType=VARCHAR}
 			and status_flag = 1
 			<if test="auditType == null || auditType == -1">
 				and audit_type in (2,3,4,5)
@@ -409,8 +409,8 @@
 	    select 
 	    <include refid="Base_Column_List" />
 	    from tab_haoban_audit
-	    where 1=1
-			and status_flag = 1
+	    where 
+			 status_flag = 1
 			and related_Id = #{relatedId}
 			and audit_type = #{auditType}
 			and audit_status = 0
@@ -420,8 +420,8 @@
 	    select 
 	    <include refid="Base_Column_List" />
 	    from tab_haoban_audit
-	    where 1=1
-			and status_flag = 1
+	    where 
+			status_flag = 1
 			and audit_type = 3
 			and audit_status = 0
 			and enterprise_id = #{enterpriseId,jdbcType=VARCHAR}