add gatewayMerchant applyid check

src/main/java/au/com/royalpay/payment/manage/gateway/core/impls/GatewayMerchantApplyImpl.java

@@ -83,7 +83,7 @@ public class GatewayMerchantApplyImpl implements GatewayMerchantApply {
         ClientRegisterInfo registerBean = JSONObject.toJavaObject(registerInfo, ClientRegisterInfo.class);
         registerBean.checkParamsInvalid();
         JSONObject result = new JSONObject();
-        JSONObject manager = managerMapper.findAvailableByLoginId(registerBean.getApplyId());
+        JSONObject manager = managerMapper.findAvailableByLoginIdAndOrgId(registerBean.getApplyId(), org.getString("org_id"));
         if (manager == null) {
             throw new ParamInvalidException("applyId","applyId is invalid");
         }

src/main/java/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.java

@@ -1,12 +1,12 @@
 package au.com.royalpay.payment.manage.mappers.system;
 
+import com.alibaba.fastjson.JSONObject;
+import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
+import com.github.miemiedev.mybatis.paginator.domain.PageList;
 import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
 import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
 import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
 import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
-import com.alibaba.fastjson.JSONObject;
-import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
-import com.github.miemiedev.mybatis.paginator.domain.PageList;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -28,6 +28,10 @@ public interface ManagerMapper {
     @AdvanceSelect(addonWhereClause = "is_valid=1")
     JSONObject findAvailableByLoginId(@Param("username") String loginId);
 
+    @AutoSql(SqlType.SELECT)
+    @AdvanceSelect(addonWhereClause = "is_valid=1")
+    JSONObject findAvailableByLoginIdAndOrgId(@Param("username") String loginId, @Param("org_id") String orgId);
+
     @AutoSql(SqlType.SELECT)
     JSONObject findByLoginId(@Param("username") String loginId);