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

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanStaffClerkRelationMapper.java

@@ -74,4 +74,6 @@ public interface TabHaobanStaffClerkRelationMapper {
 	TabHaobanStaffClerkRelation getByClerkId(@Param("clerkId")String clerkId);
 	
 	int delByPrimaryKey(@Param("staffClerkRelationId")String staffClerkRelationId);
+	
+	void delByClerkId(@Param("clerkId")String clerkId);
 }
\ No newline at end of file

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

@@ -213,6 +213,6 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 	}
 	@Override
 	public void delByClerkId(String clerkId) {
-		
+		tabHaobanStaffClerkRelationMapper.delByClerkId(clerkId);
 	}
 }

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

@@ -305,7 +305,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 			return ;
 		}
 		String pageUrl = this.getPageUrl(AppPageType.STORE_RELATED_RECORD.getCode(), data);
-		this.sendAuditMessage(tab.getStaffId(), messageTitle, messageContent, pageUrl,auditStatus,"");
+		this.sendAuditMessage(tab.getStaffId(), messageTitle, messageContent, pageUrl,auditStatus,auditReason);
 	}
 	@Override
 	public boolean sendSingleMessage(String clerkId, String title,

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

@@ -45,14 +45,14 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
 		
 		List<TabHaobanWxEnterpriseRelated> relatedList = wxEnterpriseRelatedMapper.listByWxenterpriseId(wxEnterpriseId);
 		List<EnterpriseDetailDTO> result = EntityUtil.changeEntityListByJSON(EnterpriseDetailDTO.class, relatedList);
-		for (EnterpriseDetailDTO enterpriseDetailDTO : result) {
-			String enterpriseId = enterpriseDetailDTO.getEnterpriseId();
-			int gicAllCount = storeGroupService.gicDepartmentCount(enterpriseId);
-			int syncCount = departmentService.countSyncDepartmentByEnterpriseId(enterpriseId);
-			logger.info("【企业数量】gicAllCount={},syncCount={}",gicAllCount,syncCount);
-			int nodeCount = gicAllCount - syncCount;
-			enterpriseDetailDTO.setNodeCount(nodeCount);
-		}
+//		for (EnterpriseDetailDTO enterpriseDetailDTO : result) {
+//			String enterpriseId = enterpriseDetailDTO.getEnterpriseId();
+//			int gicAllCount = storeGroupService.gicDepartmentCount(enterpriseId);
+//			int syncCount = departmentService.countSyncDepartmentByEnterpriseId(enterpriseId);
+//			logger.info("【企业数量】gicAllCount={},syncCount={}",gicAllCount,syncCount);
+//			int nodeCount = gicAllCount - syncCount;
+//			enterpriseDetailDTO.setNodeCount(nodeCount);
+//		}
 		return result;
 	}
 	

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

@@ -320,4 +320,13 @@
     	  and status_flag =1
   </update>
   
+  <update id="delByClerkId" >
+    update tab_haoban_staff_clerk_relation
+    set
+    status_flag = 0,
+    update_time = now()
+    where clerk_id = #{clerkId,jdbcType=VARCHAR}
+    	  and status_flag =1
+  </update>
+  
 </mapper>
\ No newline at end of file

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

@@ -7,7 +7,7 @@
     <result column="enterprise_id" property="enterpriseId" jdbcType="VARCHAR" />
     <result column="version" property="version" jdbcType="VARCHAR" />
     <result column="staff_id" property="staffId" jdbcType="VARCHAR" />
-    <result column="staffName" property="staffName" jdbcType="VARCHAR" />
+    <result column="staff_name" property="staffName" jdbcType="VARCHAR" />
     <result column="status_flag" property="statusFlag" jdbcType="INTEGER" />
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
     <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
@@ -87,6 +87,12 @@
       <if test="updateTime != null" >
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+       <if test="staffId != null" >
+        #{staffId},
+      </if>
+      <if test="staffName != null" >
+        #{staffName},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated" >