兼容多个appId

epmet-auth/src/main/java/com/epmet/dto/form/GovWxmpEnteOrgFormDTO.java

@@ -39,5 +39,10 @@ public class GovWxmpEnteOrgFormDTO implements Serializable {
     @NotBlank(message = "组织id不能为空",groups = {AddUserInternalGroup.class})
     private String rootAgencyId;
 
+    /**
+     * desc:小程序appId
+     */
+    private String appId;
+
 }
 

epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java

@@ -19,7 +19,6 @@ import com.epmet.constant.SmsTemplateConstant;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.GovStaffRoleDTO;
-import com.epmet.dto.UserWechatDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.*;
@@ -273,7 +272,7 @@ public class GovLoginServiceImpl implements GovLoginService {
         }
         CustomerStaffDTO customerStaff = customerStaffDTOResult.getData();
         //2、解析微信用户
-        WxMaJscode2SessionResult wxMaJscode2SessionResult = loginService.getWxMaUser(LoginConstant.APP_GOV, formDTO.getWxCode());
+        WxMaJscode2SessionResult wxMaJscode2SessionResult = loginService.getWxMaUser(LoginConstant.APP_GOV, formDTO.getWxCode(), formDTO.getAppId());
 
         //3、记录staff_wechat,并记录用户激活状态，激活时间
         this.savestaffwechat(customerStaff.getUserId(), wxMaJscode2SessionResult.getOpenid());