Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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/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" >