日元强弱问题

xpgx-service/src/main/java/com/miaxis/gan/service/impl/GanZhiServiceImpl.java

@@ -399,16 +399,16 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
             score += 12;
         }
 
-        List<String> xiYong = null;
+        List<String> xiYong = new ArrayList<String>();
         List<String> xiYongShiShen = new ArrayList<String>();
         String fiveQr = null;
         if (score > 50) {
             fiveQr = list.get(4).getFive() + "强";
-            xiYong = shiShenConfig.getXiYong().get(fiveQr);
+            xiYong.addAll(shiShenConfig.getXiYong().get(fiveQr));
             xiYongShiShen.addAll(shiShenConfig.getXiYongShiShenQ());
         } else {
             fiveQr = list.get(4).getFive() + "弱";
-            xiYong = shiShenConfig.getXiYong().get(fiveQr);
+            xiYong.addAll(shiShenConfig.getXiYong().get(fiveQr));
             xiYongShiShen.addAll(shiShenConfig.getXiYongShiShenR());
         }
         List<String> xiYongOld = new ArrayList<>();