登录以及合并好友fix

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

@@ -107,4 +107,10 @@ public interface StaffApiService {
 	 * @return
 	 */
 	public StaffDTO getWxStaffOne(String wxEnterpriseId);
+
+    /**
+     * @param wxEnterpriseId
+     * @return
+     */
+    public StaffDTO getAndAddSupperAdmin(String wxEnterpriseId);
 }

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

@@ -57,4 +57,6 @@ public interface MemberUnionidRelatedMapper {
 	 * @return
 	 */
 	MemberUnionidRelated getBySelfExternalUserId(@Param("wxUserId") String wxUserId, @Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId);
+
+	List<MemberUnionidRelated> listBySelfExternalUserId(@Param("wxUserId") String wxUserId, @Param("wxEnterpriseId") String wxEnterpriseId, @Param("selfExternalUserId") String selfExternalUserId);
 }
\ No newline at end of file

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

@@ -46,4 +46,14 @@ public interface MemberUnionRelatedService {
 	 * @return
 	 */
 	MemberUnionidRelatedDTO getBySelfExternalUserId(String wxUserId, String wxEnterpriseId, String selfExternalUserId);
+
+	/**
+	 * 根据应用内的外部联系人id 获取信息
+	 *
+	 * @param wxUserId
+	 * @param wxEnterpriseId
+	 * @param selfExternalUserId
+	 * @return
+	 */
+	List<MemberUnionidRelatedDTO> listBySelfExternalUserId(String wxUserId, String wxEnterpriseId, String selfExternalUserId);
 }

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

@@ -89,4 +89,10 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
 		MemberUnionidRelated unionidRelated = mapper.getBySelfExternalUserId(wxUserId, wxEnterpriseId, selfExternalUserId);
 		return EntityUtil.changeEntityNew(MemberUnionidRelatedDTO.class, unionidRelated);
 	}
+
+	@Override
+	public List<MemberUnionidRelatedDTO> listBySelfExternalUserId(String wxUserId, String wxEnterpriseId, String selfExternalUserId) {
+		List<MemberUnionidRelated> retList = mapper.listBySelfExternalUserId(wxUserId, wxEnterpriseId, selfExternalUserId);
+		return EntityUtil.changeEntityListNew(MemberUnionidRelatedDTO.class, retList);
+	}
 }

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

@@ -718,11 +718,15 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             dto.setSelfExternalUserid(dto.getSelfExternalUserid() == null ? midRelatedDto.getSelfExternalUserid() : dto.getSelfExternalUserid());
             dto.setMemberUnionidRelatedId(midRelatedDto.getMemberUnionidRelatedId());
             dto.setAvatar(dto.getAvatar() == null ? midRelatedDto.getAvatar() : dto.getAvatar());
-            MemberUnionidRelatedDTO oldRelation = memberUnionRelatedService.getBySelfExternalUserId(dto.getWxUserId(), dto.getWxEnterpriseId(), dto.getSelfExternalUserid());
+            List<MemberUnionidRelatedDTO> relatedDTOS = memberUnionRelatedService.listBySelfExternalUserId(dto.getWxUserId(), dto.getWxEnterpriseId(), dto.getSelfExternalUserid());
             //老的关联需要删除
-            if (null != oldRelation && (!oldRelation.getMemberUnionidRelatedId().equals(midRelatedDto.getMemberUnionidRelatedId()))) {
-                oldRelation.setStatusFlag(0);
-                memberUnionRelatedService.update(oldRelation);
+            if (CollectionUtils.isNotEmpty(relatedDTOS)) {
+                relatedDTOS.stream().filter(mid -> (!mid.getMemberUnionidRelatedId().equals(midRelatedDto.getMemberUnionidRelatedId())))
+                        .forEach(mid -> {
+                            mid.setStatusFlag(0);
+                            memberUnionRelatedService.update(mid);
+                        });
+
             }
             memberUnionRelatedService.update(dto);
             RedisUtil.unlock(lockKey);

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

@@ -1408,6 +1408,22 @@ public class StaffApiServiceImpl implements StaffApiService {
 		return EntityUtil.changeEntityByJSON(StaffDTO.class,wxStaffByOne);
 	}
 
+    @Override
+    public StaffDTO getAndAddSupperAdmin(String wxEnterpriseId) {
+        TabHaobanStaff haobanStaff = staffMapper.selectSuperByWxEnterpriseId(wxEnterpriseId);
+        if (haobanStaff != null) {
+            return EntityUtil.changeEntityNew(StaffDTO.class, haobanStaff);
+        }
+        haobanStaff = new TabHaobanStaff();
+        haobanStaff.setStaffName("超级管理员");
+        haobanStaff.setWxEnterpriseId(wxEnterpriseId);
+        haobanStaff.setSuperManagerFlag(1);
+        String staffId = staffService.add(haobanStaff);
+        haobanStaff.setStaffId(staffId);
+        StaffDTO staffDTO = EntityUtil.changeEntityNew(StaffDTO.class, haobanStaff);
+        return staffDTO;
+    }
+
 	//	private String getMobile(String phoneNumber,String nationcode){
 //		String mobile = nationcode + phoneNumber;
 //		return mobile;

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

@@ -325,4 +325,13 @@
     and wx_user_id = #{wxUserId, jdbcType=CHAR}
     and self_external_userid = #{selfExternalUserId}
   </select>
+  <select id="listBySelfExternalUserId" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List"/>
+    from tab_haoban_member_unionid_related
+    where wx_enterprise_id = #{wxEnterpriseId}
+    and status_flag = 1
+    and wx_user_id = #{wxUserId, jdbcType=CHAR}
+    and self_external_userid = #{selfExternalUserId}
+  </select>
 </mapper>
\ No newline at end of file

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/LoginController.java

@@ -163,7 +163,11 @@ public class LoginController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_4);
 		}
 		//TODO 获取超级管理员账号接口
-		StaffDTO staff = staffApiService.selectSuperByWxEnterpriseId(wxEnterpriseId);
+		StaffDTO staff = staffApiService.getAndAddSupperAdmin(wxEnterpriseId);
+		if (staff == null) {
+			logger.info("运维登录超级管理员不存在");
+			return resultResponse(HaoBanErrCode.ERR_6);
+		}
 //		StaffDTO staff = staffApiService.selectById("1");
 		LoginDTO loginVO = new LoginDTO();
 		loginVO.setWxEnterpriseId(wxEnterpriseId);