Commit 21cb3765 by 墨竹

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

parents 93db749f 51629c18
...@@ -15,7 +15,7 @@ public interface StaffApiService { ...@@ -15,7 +15,7 @@ public interface StaffApiService {
List<StaffDTO> listByIds(List<String> staffIds); List<StaffDTO> listByIds(List<String> staffIds);
List<StaffDTO> listByWxUserId(String wxUserId); List<StaffDTO> listByWxUserId(String wxUserId,String wxEnterpriseId);
StaffDTO selectByNationcodeAndPhoneNumber(String wxEnterpriseId, String nationcode, String phoneNumber); StaffDTO selectByNationcodeAndPhoneNumber(String wxEnterpriseId, String nationcode, String phoneNumber);
......
...@@ -20,7 +20,7 @@ public interface StaffMapper { ...@@ -20,7 +20,7 @@ public interface StaffMapper {
List<TabHaobanStaff> listByIds(@Param("staffIds") List<String> staffIds); List<TabHaobanStaff> listByIds(@Param("staffIds") List<String> staffIds);
List<TabHaobanStaff> listByWxUserId(@Param("wxUserId") String wxUserId); List<TabHaobanStaff> listByWxUserId(@Param("wxUserId") String wxUserId,@Param("wxEnterpriseId") String wxEnterpriseId);
List<TabHaobanStaff> listLikeName(@Param("staffName") String staffName, @Param("wxEnterpriseId") String wxEnterpriseId); List<TabHaobanStaff> listLikeName(@Param("staffName") String staffName, @Param("wxEnterpriseId") String wxEnterpriseId);
......
...@@ -18,7 +18,8 @@ public interface TabHaobanExternalClerkRelatedMapper { ...@@ -18,7 +18,8 @@ public interface TabHaobanExternalClerkRelatedMapper {
int updateByPrimaryKeySelective(TabHaobanExternalClerkRelated record); int updateByPrimaryKeySelective(TabHaobanExternalClerkRelated record);
TabHaobanExternalClerkRelated selectByClerkIdAndExternalUserId(@Param("clerkId") String clerkId, @Param("externalUserId") String externalUserId); TabHaobanExternalClerkRelated selectByClerkIdAndExternalUserId(@Param("clerkId") String clerkId,
@Param("externalUserId") String externalUserId);
void delByUserIdAndExternalUserId(TabHaobanExternalClerkRelated record); void delByUserIdAndExternalUserId(TabHaobanExternalClerkRelated record);
......
...@@ -69,7 +69,13 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ ...@@ -69,7 +69,13 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
public void delByUserIdAndExternalUserId(MemberUnionidRelatedDTO dto) { public void delByUserIdAndExternalUserId(MemberUnionidRelatedDTO dto) {
mapper.delByUserIdAndExternalUserId(EntityUtil.changeEntityByJSON(TabHaobanExternalClerkRelated.class, dto)); mapper.delByUserIdAndExternalUserId(EntityUtil.changeEntityByJSON(TabHaobanExternalClerkRelated.class, dto));
String wxUserId = dto.getWxUserId(); String wxUserId = dto.getWxUserId();
List<TabHaobanStaff> tabHaobanStaffs = staffMapper.listByWxUserId(wxUserId); String externalUserid = dto.getExternalUserid();
List<TabHaobanExternalClerkRelated> tabHaobanExternalClerkRelatedList = mapper.listByExTernalUseridAndWxUserId(externalUserid, wxUserId, 2);
if (CollectionUtils.isEmpty(tabHaobanExternalClerkRelatedList)) {
logger.info("无解除的好友关系:externalUserid:{},wxUserId:{}", externalUserid, wxUserId);
return;
}
List<TabHaobanStaff> tabHaobanStaffs = staffMapper.listByWxUserId(wxUserId, tabHaobanExternalClerkRelatedList.get(0).getWxEnterpriseId());
if (CollectionUtils.isEmpty(tabHaobanStaffs)) { if (CollectionUtils.isEmpty(tabHaobanStaffs)) {
logger.error("找不到员工:wxUserId:{}", wxUserId); logger.error("找不到员工:wxUserId:{}", wxUserId);
return; return;
...@@ -147,7 +153,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ ...@@ -147,7 +153,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
@Override @Override
public List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId) { public List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId) {
return mapper.listByExTernalUseridAndWxUserId(externalUserid, wxUserId,1); return mapper.listByExTernalUseridAndWxUserId(externalUserid, wxUserId, 1);
} }
@Override @Override
......
...@@ -1112,8 +1112,8 @@ public class StaffApiServiceImpl implements StaffApiService { ...@@ -1112,8 +1112,8 @@ public class StaffApiServiceImpl implements StaffApiService {
} }
@Override @Override
public List<StaffDTO> listByWxUserId(String wxUserId) { public List<StaffDTO> listByWxUserId(String wxUserId,String wxEnterpriseId) {
List<TabHaobanStaff> list = staffMapper.listByWxUserId(wxUserId); List<TabHaobanStaff> list = staffMapper.listByWxUserId(wxUserId,wxEnterpriseId);
return EntityUtil.changeEntityListByJSON(StaffDTO.class, list); return EntityUtil.changeEntityListByJSON(StaffDTO.class, list);
} }
......
...@@ -305,9 +305,9 @@ ...@@ -305,9 +305,9 @@
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from tab_haoban_staff from tab_haoban_staff
where status_flag = 1 where status_flag = 1 and wx_user_id = #{wxUserId,jdbcType=VARCHAR}
<if test="wxUserId != null"> <if test="wxEnterpriseId != null and wxEnterpriseId != ''">
and wx_user_id = #{wxUserId,jdbcType=VARCHAR} and wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
</if> </if>
</select> </select>
......
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
and status_flag = 1 and status_flag = 1
</select> </select>
<select id="listByExTernalUseridAndWxUserId" resultMap="BaseResultMap" parameterType="java.lang.String"> <select id="listByExTernalUseridAndWxUserId" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from tab_haoban_external_clerk_related from tab_haoban_external_clerk_related
......
...@@ -141,10 +141,10 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -141,10 +141,10 @@ public class WxEnterpriseInfoController extends WebBaseController {
DictDTO loginUserId = managerDictService.getSMSDict("app_login_phone_num", loginStaff.getPhoneNumber()); DictDTO loginUserId = managerDictService.getSMSDict("app_login_phone_num", loginStaff.getPhoneNumber());
logger.info("伪登录:{},userId:{}", loginStaff.getPhoneNumber(), JSONObject.toJSONString(loginUserId)); logger.info("伪登录:{},userId:{}", loginStaff.getPhoneNumber(), JSONObject.toJSONString(loginUserId));
if (null != loginUserId) { if (null != loginUserId) {
String val = loginUserId.getDictValue(); String dictValue = loginUserId.getDictValue();
List<StaffDTO> staffDTOS = new ArrayList<>(); List<StaffDTO> staffDTOS = new ArrayList<>();
List<StaffDTO> phoneDtos = staffApiService.listByPhoneNumber(val); List<StaffDTO> phoneDtos = staffApiService.listByPhoneNumber(dictValue);
List<StaffDTO> userDtos = staffApiService.listByWxUserId(val); List<StaffDTO> userDtos = staffApiService.listByWxUserId(dictValue,loginStaff.getWxEnterpriseId());
if (CollectionUtils.isNotEmpty(phoneDtos)) { if (CollectionUtils.isNotEmpty(phoneDtos)) {
staffDTOS.addAll(phoneDtos); staffDTOS.addAll(phoneDtos);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment