fix

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

@@ -33,7 +33,7 @@ public interface StaffApiService {
 
 	public void syscGicClerk(String fieldListString);
 
-	public StaffDTO selectByUserId(String userId);
+	public StaffDTO selectByUserIdAndEnterpriseId(String userId,String wxEnterpriseId);
 
 	public StaffDepartmentRelatedDTO getDepartmentIdAndStaffId(String departmentId, String staffId);
 

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

@@ -27,7 +27,7 @@ public interface StaffMapper {
 	
 	Page<TabHaobanStaff> pageStaff(@Param("staffIds")Set<String> staffIds, @Param("activeFlag")Integer activeFlag, @Param("keyword")String keyword);
 
-	TabHaobanStaff selectByUserId(@Param("userId")String userId);
+	TabHaobanStaff selectByUserIdAndEnterpriseId(@Param("userId")String userId,@Param("wxEnterpriseId")String wxEnterpriseId);
 	
 	TabHaobanStaff selectSuperByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
 }
\ No newline at end of file

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

@@ -16,10 +16,10 @@ public interface StaffService {
 
 	Page<TabHaobanStaff> pageStaff(Set<String> staffIds, Integer activeFlag, String keyword);
 
-	TabHaobanStaff selectByUserId(String userId);
-
 	void updateByPrimaryKey(TabHaobanStaff tab);
 
 	int delByuserid(String staffId);
 
+	TabHaobanStaff selectByUserIdAndEnterpriseId(String userId, String wxEnterpriseId);
+
 }

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

@@ -53,9 +53,9 @@ public class StaffServiceImpl implements StaffService {
 	}
 
 	@Override
-	public TabHaobanStaff selectByUserId(String userId) {
+	public TabHaobanStaff selectByUserIdAndEnterpriseId(String userId,String wxEnterpriseId) {
 		
-		return mapper.selectByUserId(userId);
+		return mapper.selectByUserIdAndEnterpriseId(userId,wxEnterpriseId);
 	}
 
 	@Override

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

@@ -218,7 +218,7 @@ public class MessageApiServiceImpl implements MessageApiService {
             if(qywxCallBackDTO.getChangeType().equals(WxEditType.ADDUSER.getCode())){
                 this.addUser(qywxCallBackDTO, staff);
             } else if(qywxCallBackDTO.getChangeType().equals(WxEditType.UPDATEUSER.getCode())){
-                TabHaobanStaff oldStaff = this.staffService.selectByUserId(qywxCallBackDTO.getUserid());
+                TabHaobanStaff oldStaff = this.staffService.selectByUserIdAndEnterpriseId(qywxCallBackDTO.getUserid(),enterprise.getWxEnterpriseId());
                 if(oldStaff != null){
                     staff.setWxUserId(qywxCallBackDTO.getNewUserid());
                     staff.setStaffId(oldStaff.getStaffId());
@@ -268,7 +268,7 @@ public class MessageApiServiceImpl implements MessageApiService {
                     this.addUser(qywxCallBackDTO, staff);
                 }
             } else {
-                TabHaobanStaff oldStaff = this.staffService.selectByUserId(qywxCallBackDTO.getUserid());
+                TabHaobanStaff oldStaff = this.staffService.selectByUserIdAndEnterpriseId(qywxCallBackDTO.getUserid(),enterprise.getWxEnterpriseId());
                 //List<TabHaobanStaffDepartmentRelated> list = staffDepartmentRelatedService.listStaffDepartmentByStaffId(staff.getStaffId());
                 if(oldStaff != null){
                 	List<TabHaobanStaffDepartmentRelated> relatedList = staffDepartmentRelatedService.listStaffDepartmentByStaffId(oldStaff.getStaffId());
@@ -289,7 +289,7 @@ public class MessageApiServiceImpl implements MessageApiService {
 
     private void addUser(QywxCallBackDTO qywxCallBackDTO, TabHaobanStaff staff){
     	TabHaobanWxEnterprise enterprise = this.enterpriseService.getEnterpriseBycorpId(qywxCallBackDTO.getAuthCorpId());
-    	StaffDTO staffDTO = staffApiService.selectByUserId(staff.getWxUserId());
+    	StaffDTO staffDTO = staffApiService.selectByUserIdAndEnterpriseId(staff.getWxUserId(),enterprise.getWxEnterpriseId());
     	String[] departArr = qywxCallBackDTO.getDepartment();
     	String departmentIds = "";
     	for(String s : departArr){

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

@@ -277,7 +277,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 	public void wxGetAdd(String userId,String wxEnterpriseId) {
 		//获取微信用户信息
 		
-		TabHaobanStaff staff = staffService.selectByUserId(userId);
+		TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId,wxEnterpriseId);
 		if(staff == null) {
 			WxEnterpriseDTO enterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
 			TabHaobanWxApplication application = wxApplicationService.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId,1);
@@ -459,8 +459,8 @@ public class StaffApiServiceImpl implements StaffApiService {
 	}
 
 	@Override
-	public StaffDTO selectByUserId(String userId) {
-		return EntityUtil.changeEntityByJSON(StaffDTO.class, staffService.selectByUserId(userId));
+	public StaffDTO selectByUserIdAndEnterpriseId(String userId,String wxEnterpriseId) {
+		return EntityUtil.changeEntityByJSON(StaffDTO.class, staffService.selectByUserIdAndEnterpriseId(userId,wxEnterpriseId));
 	}
 
 	@Override

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

@@ -284,11 +284,12 @@
   </select>
   
   
-  <select id="selectByUserId" resultMap="BaseResultMap" parameterType="java.lang.String" >
+  <select id="selectByUserIdAndEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
     <include refid="Base_Column_List" />
     from tab_haoban_staff
     where wx_user_id = #{userId,jdbcType=VARCHAR}
+    and wx_enterprise_id = #{wxEnterpriseId}
     and status_flag = 1
   </select>
   

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

@@ -57,14 +57,17 @@ public class LoginController extends WebBaseController{
 		}
 		UserDTO user  = JSON.parseObject(userJson, UserDTO.class);
 		logger.info("【企业微信登录】userId={},auth_code={}",user.getUserid(),auth_code);
-		StaffDTO loginStaff = staffApiService.selectByUserId(user.getUserid());
+		String corpId = user.getCorpid();
+		WxEnterpriseDTO enterprise = wxEnterpriseApiService.getEnterpriseBycorpId(corpId);
+		StaffDTO loginStaff = null;
+		if(enterprise != null){
+			loginStaff = staffApiService.selectByUserIdAndEnterpriseId(user.getUserid(),enterprise.getWxEnterpriseId());
+		}
 		
 		if(loginStaff == null){
-			String corpId = user.getCorpid();
-			WxEnterpriseDTO enterprise = wxEnterpriseApiService.getEnterpriseBycorpId(corpId);
 			if(enterprise != null){
 				staffApiService.wxGetAdd(user.getUserid(),enterprise.getWxEnterpriseId());
-				loginStaff = staffApiService.selectByUserId(user.getUserid());
+				loginStaff = staffApiService.selectByUserIdAndEnterpriseId(user.getUserid(),enterprise.getWxEnterpriseId());
 			}
 		}
 

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

@@ -39,13 +39,16 @@ public class InfoController extends WebBaseController{
 		logger.info("userDTOJson=============>{}",userDTOJson);
 		UserDTO user = JSON.parseObject(userDTOJson, UserDTO.class);
 		String userId = user.getUserid();
-		StaffDTO loginStaff = staffApiService.selectByUserId(userId);
+		String corpId = user.getCorpid();
+		WxEnterpriseDTO enterprise = wxEnterpriseApiService.getEnterpriseBycorpId(corpId);
+		StaffDTO loginStaff = null;
+		if(enterprise != null){
+			loginStaff = staffApiService.selectByUserIdAndEnterpriseId(userId,enterprise.getWxEnterpriseId());
+		}
 		if(loginStaff == null){
-			String corpId = user.getCorpid();
-			WxEnterpriseDTO enterprise = wxEnterpriseApiService.getEnterpriseBycorpId(corpId);
 			if(enterprise != null){
 				staffApiService.wxGetAdd(userId,enterprise.getWxEnterpriseId());
-				loginStaff = staffApiService.selectByUserId(userId);
+				loginStaff = staffApiService.selectByUserIdAndEnterpriseId(userId,enterprise.getWxEnterpriseId());
 			}
 		}