Merge branch 'feature/01-10' into developer

# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

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

@@ -40,6 +40,15 @@ public interface StaffApiService {
 
 	void staffEdit(StaffDTO staffDTO, String departmentIds);
 
+	/**
+	 * 选择用户id和企业标识
+	 *
+	 * @param userId         用户id
+	 * @param wxEnterpriseId wx企业标识
+	 * @return {@link StaffDTO }
+	 * @author mozhu
+	 * @date 2022-01-13 15:02:22
+	 */
 	StaffDTO selectByUserIdAndEnterpriseId(String userId, String wxEnterpriseId);
 
 	StaffDepartmentRelatedDTO getDepartmentIdAndStaffId(String departmentId, String staffId);

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

@@ -26,6 +26,15 @@ public interface StaffMapper {
 
 	Page<TabHaobanStaff> pageStaff(@Param("staffIds") Set<String> staffIds, @Param("activeFlag") Integer activeFlag, @Param("keyword") String keyword);
 
+	/**
+	 * 选择用户id和企业标识
+	 *
+	 * @param userId         用户id
+	 * @param wxEnterpriseId wx企业标识
+	 * @return {@link TabHaobanStaff }
+	 * @author mozhu
+	 * @date 2022-01-13 15:05:28
+	 */
 	TabHaobanStaff selectByUserIdAndEnterpriseId(@Param("userId") String userId,
 												 @Param("wxEnterpriseId") String wxEnterpriseId);
 
@@ -123,16 +132,4 @@ public interface StaffMapper {
 	 */
 	TabHaobanStaff selectByPhoneNumberAndEnterpriseId(@Param("phoneNumber") String phoneNumber,
 													  @Param("wxEnterpriseId") String wxEnterpriseId);
-
-	/**
-	 * 根据微信用户id查询员工
-	 *
-	 * @param wxEnterpriseId wx企业标识
-	 * @param wxUserId       wx用户id
-	 * @return {@link TabHaobanStaff }
-	 * @author mozhu
-	 * @date 2022-01-13 14:41:40
-	 */
-	TabHaobanStaff getStaffByWxUserId(@Param("wxEnterpriseId") String wxEnterpriseId,
-									  @Param("wxUserId") String wxUserId);
 }
\ No newline at end of file

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

@@ -21,6 +21,15 @@ public interface StaffService {
 
     int delByuserid(String staffId);
 
+    /**
+     * 选择用户id和企业标识
+     *
+     * @param userId         用户id
+     * @param wxEnterpriseId wx企业标识
+     * @return {@link TabHaobanStaff }
+     * @author mozhu
+     * @date 2022-01-13 15:02:30
+     */
     TabHaobanStaff selectByUserIdAndEnterpriseId(String userId, String wxEnterpriseId);
 
 
@@ -76,7 +85,6 @@ public interface StaffService {
      */
     List<StaffDTO> listByOpenUserIdsAndWxEnterpriseId(List<String> openUserIds, String wxEnterpriseId);
 
-
     /**
      * 更新开放用户id,用户id
      *
@@ -90,16 +98,4 @@ public interface StaffService {
     int updateOpenUserIdsByUserId(String wxEnterpriseId, String wxUserId, String wxOpenUseId);
 
 
-    /**
-     * 选择通过corpid和用户id和企业id
-     *
-     * @param corpid         corpid
-     * @param userId         用户id
-     * @param wxEnterpriseId wx企业标识
-     * @return {@link TabHaobanStaff }
-     * @author mozhu
-     * @date 2021-12-21 22:54:25
-     */
-    TabHaobanStaff selectByCorpidAndUserIdAndEnterpriseId(String corpid, String userId, String wxEnterpriseId);
-
 }

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

@@ -64,17 +64,7 @@ public class StaffServiceImpl implements StaffService {
 
     @Override
     public TabHaobanStaff selectByUserIdAndEnterpriseId(String userId, String wxEnterpriseId) {
-        TabHaobanWxEnterprise tabHaobanWxEnterprise = wxEnterpriseMapper.selectByPrimaryKey(wxEnterpriseId);
-        if (tabHaobanWxEnterprise == null) {
-            return null;
-        }
-        String corpid = tabHaobanWxEnterprise.getCorpid();
-        log.info("corpid：{}", corpid);
-        if (corpid.length() > 20 && userId.length() == 32) {
-            return mapper.selectByOpenUserIdAndEnterpriseId(userId, wxEnterpriseId);
-        } else {
-            return mapper.selectByUserIdAndEnterpriseId(userId, wxEnterpriseId);
-        }
+        return mapper.selectByUserIdAndEnterpriseId(userId, wxEnterpriseId);
     }
 
     @Override
@@ -132,12 +122,4 @@ public class StaffServiceImpl implements StaffService {
         return mapper.updateOpenUserIdsByUserId(wxEnterpriseId, wxUserId, wxOpenUseId);
     }
 
-    @Override
-    public TabHaobanStaff selectByCorpidAndUserIdAndEnterpriseId(String corpid, String userId, String wxEnterpriseId) {
-        if (corpid.length() > 20) {
-            return mapper.selectByOpenUserIdAndEnterpriseId(userId, wxEnterpriseId);
-        } else {
-            return mapper.selectByUserIdAndEnterpriseId(userId, wxEnterpriseId);
-        }
-    }
 }

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

@@ -372,7 +372,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             checkQywxSettingApiService.saveFriendCallback(wxEnterpriseId, null, dto);
             return;
         }
-        TabHaobanStaff staff = staffService.selectByCorpidAndUserIdAndEnterpriseId(corpid, wxUserId, wxEnterpriseId);
+        TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId( wxUserId, wxEnterpriseId);
         if (staff == null) {
             log.info("staff不存在：{},{}", dto.getUnionid(), dto.getWxUserId());
             return;

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

@@ -314,9 +314,9 @@
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_staff
-        where wx_user_id = #{userId,jdbcType=VARCHAR}
+        where (wx_user_id = #{userId,jdbcType=VARCHAR} or wx_open_user_id = #{userId,jdbcType=VARCHAR})
         and wx_enterprise_id = #{wxEnterpriseId}
-        and status_flag = 1
+        and status_flag = 1 limit 1
     </select>
 
     <select id="selectSuperByWxEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String">
@@ -459,13 +459,4 @@
         and status_flag = 1 limit 1
     </select>
 
-    <select id="getStaffByWxUserId" resultMap="BaseResultMap" parameterType="java.lang.String">
-        select
-        <include refid="Base_Column_List"/>
-        from tab_haoban_staff
-        and wx_enterprise_id = #{wxEnterpriseId}
-        and wx_user_id = #{wxUserId}
-        and status_flag = 1 limit 1
-    </select>
-
 </mapper>
\ No newline at end of file