fix

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

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
@@ -19,6 +20,7 @@ import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.MD5Utils;
 import com.gic.commons.util.Md5Util;
 import com.gic.commons.util.StringUtil;
+import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
 import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
@@ -65,6 +67,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 	private StaffDepartmentRelatedApiService staffDepartmentRelatedApiService;
 	@Autowired
 	private ClerkService clerkService;
+	@Autowired
+	private DepartmentApiService departmentApiService;
 
 
 	@Override
@@ -140,9 +144,17 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			}
 			if(SELF_APP.equals(suiteid)){
 				List<StaffDepartmentRelatedDTO> relatedList = staffDepartmentRelatedApiService.listByStaffId(staff.getStaffId());
-				String clerkCode = "";
-				if(!relatedList.isEmpty()){
+				List<StaffDepartmentRelatedDTO> rList = new ArrayList<StaffDepartmentRelatedDTO>();
 				for (StaffDepartmentRelatedDTO staffDepartmentRelatedDTO : relatedList) {
+					DepartmentDTO depart = departmentApiService.selectById(staffDepartmentRelatedDTO.getDepartmentId());
+					if(depart.getEnterpriseId().equals(tabHaobanWxEnterpriseRelated.getEnterpriseId())){
+						rList.add(staffDepartmentRelatedDTO);
+					}
+				}
+				//DepartmentDTO departmentDTO =
+				String clerkCode = "";
+				if(!rList.isEmpty()){
+					for (StaffDepartmentRelatedDTO staffDepartmentRelatedDTO : rList) {
 						clerkCode = staffDepartmentRelatedDTO.getClerkCode();
 						if(StringUtils.isNotBlank(clerkCode)){
 							break;