Merge branch 'develop-hlj' into 'develop'

合并多实体适配

See merge request isc-v3.1/isc-common!1

isc-common-service-setmod/src/main/java/com/brilliance/isc/common/glemod/service/impl/GlemodServiceImpl.java

@@ -1245,6 +1245,7 @@ public class GlemodServiceImpl implements GlemodService {
         Map<String, Object> dyncMap = new HashMap<>();
         if (!MdaUtils.isEmpty(actVal)) {
             Streams.streamSet(actStm, actVal);
+            /** 定制化逻辑先屏蔽
             for (int i = 1; i <= Streams.streamCount(actStm); i++) {
                 line = Strings.trim(Strings.getLine(actStm, i));
                 if (MdaUtils.compareTo(line, "") != 0) {
@@ -1331,6 +1332,9 @@ public class GlemodServiceImpl implements GlemodService {
                     }
                 }
             }
+             */
+            //黑龙江农信暂时没有账号特殊处理
+            Streams.streamSet(realStm, actVal);
         }
         //= StreamGet( $ActStm )
         return MdaUtils.toString(realStm);
@@ -1438,7 +1442,9 @@ public class GlemodServiceImpl implements GlemodService {
              endif
              **/
         } else {
-            res = res + " AND ( ACCTYP='O' AND HOLPTYINR = '" + this.getHeqinr() + "' ) ";
+//            res = res + " AND ( ACCTYP='O' AND HOLPTYINR = '" + this.getHeqinr() + "' ) ";
+            //读取归属机构下所有银行自有账号
+            res = res + " AND ( ACCTYP='O' AND HOLPTYINR in (SELECT inr FROM pty WHERE PTYTYP = 'BA' and BRANCHINR IN (SELECT BRANCHINR FROM PTY where inr = '"+this.getHeqinr()+"') ) ) ";
         }
         return res;