fix

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/MemberUnionidRelatedDTO.java

@@ -17,6 +17,8 @@ public class MemberUnionidRelatedDTO implements Serializable{
 
     private String wxEnterpriseId;
     
+    private String enterpriseId;
+
     private Integer statusFlag;
 
     private String externalUserid;
@@ -147,5 +149,13 @@ public class MemberUnionidRelatedDTO implements Serializable{
 		this.addCreateTime = addCreateTime;
 	}
 
+	public String getEnterpriseId() {
+		return enterpriseId;
+	}
+
+	public void setEnterpriseId(String enterpriseId) {
+		this.enterpriseId = enterpriseId;
+	}
+
     
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/MemberUnionidRelated.java

@@ -12,6 +12,8 @@ public class MemberUnionidRelated implements Serializable {
 
     private String wxEnterpriseId;
     
+    private String enterpriseId;
+
     private Integer statusFlag;
 
     private String externalUserid;
@@ -126,6 +128,14 @@ public class MemberUnionidRelated implements Serializable {
 		this.addCreateTime = addCreateTime;
 	}
 
+	public String getEnterpriseId() {
+		return enterpriseId;
+	}
+
+	public void setEnterpriseId(String enterpriseId) {
+		this.enterpriseId = enterpriseId;
+	}
+
     
     
 }
\ No newline at end of file

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

@@ -229,7 +229,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		for (TabHaobanWxEnterpriseRelated tabHaobanWxEnterpriseRelated : list) {
 			String key = "external" + tabHaobanWxEnterpriseRelated.getEnterpriseId() + "_"+ userId1 + "_" + name + "_" + createTime;
 			RedisUtil.lock(key,2l);
-			dto.setWxEnterpriseId(tabHaobanWxEnterpriseRelated.getEnterpriseId());
+			dto.setWxEnterpriseId(tabHaobanWxEnterpriseRelated.getWxEnterpriseId());
+			dto.setEnterpriseId(tabHaobanWxEnterpriseRelated.getEnterpriseId());
 			MemberDTO member = null;
 			TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId1, tabHaobanWxEnterpriseRelated.getWxEnterpriseId());
 			if(staff == null){

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

@@ -6,6 +6,7 @@
     <result column="member_id" property="memberId" jdbcType="VARCHAR" />
     <result column="unionid" property="unionid" jdbcType="VARCHAR" />
     <result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR" />
+    <result column="enterprise_id" property="enterpriseId" jdbcType="VARCHAR" />
     <result column="status_flag" property="statusFlag" jdbcType="INTEGER" />
     <result column="external_userid" property="externalUserid" jdbcType="VARCHAR" />
     <result column="wx_user_id" property="wxUserId" jdbcType="VARCHAR" />
@@ -17,7 +18,7 @@
   </resultMap>
   <sql id="Base_Column_List" >
     member_unionid_related_id, member_id, unionid, wx_enterprise_id, status_flag, external_userid, 
-    wx_user_id, create_time, update_time,add_create_time,self_external_userid,external_name
+    wx_user_id, create_time, update_time,add_create_time,self_external_userid,external_name,enterprise_id
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -33,11 +34,11 @@
     insert into tab_haoban_member_unionid_related (member_unionid_related_id, member_id, 
       unionid, wx_enterprise_id, status_flag, 
       external_userid, wx_user_id, create_time, 
-      update_time,add_create_time,self_external_userid,external_name)
+      update_time,add_create_time,self_external_userid,external_name,enterprise_id)
     values (#{memberUnionidRelatedId,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, 
       #{unionid,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR}, #{statusFlag,jdbcType=INTEGER}, 
       #{externalUserid,jdbcType=VARCHAR}, #{wxUserId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP},#{addCreateTime},#{selfExternalUserid},#{externalName})
+      #{updateTime,jdbcType=TIMESTAMP},#{addCreateTime},#{selfExternalUserid},#{externalName},#{enterpriseId})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated" >
     insert into tab_haoban_member_unionid_related
@@ -54,6 +55,9 @@
       <if test="wxEnterpriseId != null" >
         wx_enterprise_id,
       </if>
+      <if test="enterpriseId != null" >
+        enterprise_id,
+      </if>
       <if test="statusFlag != null" >
         status_flag,
       </if>
@@ -92,6 +96,9 @@
       <if test="wxEnterpriseId != null" >
         #{wxEnterpriseId,jdbcType=VARCHAR},
       </if>
+      <if test="enterpriseId != null" >
+        #{enterpriseId,jdbcType=VARCHAR},
+      </if>
       <if test="statusFlag != null" >
         #{statusFlag,jdbcType=INTEGER},
       </if>
@@ -130,6 +137,9 @@
       <if test="wxEnterpriseId != null" >
         wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
       </if>
+       <if test="enterpriseId != null" >
+        enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
+      </if>
       <if test="statusFlag != null" >
         status_flag = #{statusFlag,jdbcType=INTEGER},
       </if>
@@ -162,6 +172,7 @@
     set member_id = #{memberId,jdbcType=VARCHAR},
       unionid = #{unionid,jdbcType=VARCHAR},
       wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
+      enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
       status_flag = #{statusFlag,jdbcType=INTEGER},
       external_userid = #{externalUserid,jdbcType=VARCHAR},
       wx_user_id = #{wxUserId,jdbcType=VARCHAR},

haoban-manage3-service/src/test/java/ServiceTest.java

@@ -19,7 +19,7 @@ public class ServiceTest {
 
 	@Test
 	public void test() {
-		wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId("073e89a37eb14acabf258e59a57359b6");
+		//wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId("073e89a37eb14acabf258e59a57359b6");
 	}