t rebase::Merge branch 'master' of bwpgit:BWPB3/B3YunKen

BWP.B3_YunKen/BLActions/CustomerCreditPolicyBLAction.cs

@@ -36,7 +36,7 @@ namespace BWP.B3_YunKen.BLActions
             tuple = new Tuple<long?, long>((long?)reader[0], (long)reader[1]);
           }
         }
-        if (customer.CreditPolicy_ID == tuple.Item1)
+        if (tuple != null && customer.CreditPolicy_ID == tuple.Item1)
           return;
 
         if (tuple != null && tuple.Item1 != null) {
@@ -49,7 +49,8 @@ namespace BWP.B3_YunKen.BLActions
           update.Where.Conditions.Add(DQCondition.EQ("ID", tuple.Item2));
           context.Session.ExecuteNonQuery(update);
         }
-
+        
+        List<Tuple<long?, long?>> list = new List<Tuple<long?, long?>>();
         var scp = new JoinAlias(typeof(SaleCreditPolicy));
         var scp_detail = new JoinAlias(typeof(SaleCreditPolicy_Detail));
         var main = new DQueryDom(saleCreditPolicy);
@@ -57,8 +58,7 @@ namespace BWP.B3_YunKen.BLActions
         main.Columns.Add(DQSelectColumn.Field("Customer_ID", detail));
         main.Columns.Add(DQSelectColumn.Field("ID", saleCreditPolicy));
         main.Where.Conditions.Add(DQCondition.EQ("CreditPolicy_ID", customer.CreditPolicy_ID));
-        List<Tuple<long?, long?>> list = new List<Tuple<long?, long?>>();
-        using (var reader = context.Session.ExecuteReader(query)) {
+        using (var reader = context.Session.ExecuteReader(main)) {
           while (reader.Read()) {
             list.Add(new Tuple<long?, long?>((long?)reader[0], (long?)reader[1]));
           }