fix: personal pkg avail tt

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackaeServiceImpl.java

@@ -984,7 +984,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
             // 保存接单对象，全职学术推广员，允许选多个
             List<String> userList = wmScorePackage.getUserList();
-            if (null != userList && userList.size() > 0) {
+            if (CollUtil.isNotEmpty(userList)) {
                 List<WmScorePackageStatus> stuList = new ArrayList<>();
                 for (String userId : userList) {
                     WmScorePackageStatus wmScorePackageStatus = new WmScorePackageStatus();
@@ -1011,40 +1011,40 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
             // 保存有效任务类型
             List<WmTaskTypeTree> tasktypeList = wmScorePackage.getTaskTypeList();
 
-            if (null != tasktypeList && tasktypeList.size() > 0) {
-
-                // 如果存在taskTypeId=39 则同时增加应收账款回款-A类、B类、C类任务类型（39/40/41）
-                if (tasktypeList.stream().anyMatch(wmTaskTypeTree -> "39".equals(wmTaskTypeTree.getTaskTypeId()))) {
-                    WmTaskTypeTree addTaskTypeTree40 = new WmTaskTypeTree();
-                    addTaskTypeTree40.setTaskTypeId("40");
-                    addTaskTypeTree40.setTaskTypeName("应收账款回款-B类");
-                    WmTaskTypeTree addTaskTypeTree41 = new WmTaskTypeTree();
-                    addTaskTypeTree41.setTaskTypeId("41");
-                    addTaskTypeTree41.setTaskTypeName("应收账款回款-C类");
-                    tasktypeList.add(addTaskTypeTree40);
-                    tasktypeList.add(addTaskTypeTree41);
-                }
-                // 如果存在taskTypeId=42 则同时增加手术跟台-一级/手术跟台-二级/手术跟台-三级任务类型（42/43/44）
-                if (tasktypeList.stream().anyMatch(wmTaskTypeTree -> "42".equals(wmTaskTypeTree.getTaskTypeId()))) {
-                    WmTaskTypeTree addTaskTypeTree43 = new WmTaskTypeTree();
-                    addTaskTypeTree43.setTaskTypeId("43");
-                    WmTaskTypeTree addTaskTypeTree44 = new WmTaskTypeTree();
-                    addTaskTypeTree44.setTaskTypeId("44");
-                    tasktypeList.add(addTaskTypeTree43);
-                    tasktypeList.add(addTaskTypeTree44);
-                }
-                // 如果存在taskTypeId=47 47,库存调研 48,竞品调研  49,培训 50,使用情况调查
-                if (tasktypeList.stream().anyMatch(wmTaskTypeTree -> "47".equals(wmTaskTypeTree.getTaskTypeId()))) {
-                    WmTaskTypeTree addTaskTypeTree48 = new WmTaskTypeTree();
-                    addTaskTypeTree48.setTaskTypeId("48");
-                    WmTaskTypeTree addTaskTypeTree49 = new WmTaskTypeTree();
-                    addTaskTypeTree49.setTaskTypeId("49");
-                    WmTaskTypeTree addTaskTypeTree50 = new WmTaskTypeTree();
-                    addTaskTypeTree50.setTaskTypeId("50");
-                    tasktypeList.add(addTaskTypeTree48);
-                    tasktypeList.add(addTaskTypeTree49);
-                    tasktypeList.add(addTaskTypeTree50);
-                }
+            if (CollUtil.isNotEmpty(tasktypeList)) {
+
+                // // 如果存在taskTypeId=39 则同时增加应收账款回款-A类、B类、C类任务类型（39/40/41）
+                // if (tasktypeList.stream().anyMatch(wmTaskTypeTree -> "39".equals(wmTaskTypeTree.getTaskTypeId()))) {
+                //     WmTaskTypeTree addTaskTypeTree40 = new WmTaskTypeTree();
+                //     addTaskTypeTree40.setTaskTypeId("40");
+                //     addTaskTypeTree40.setTaskTypeName("应收账款回款-B类");
+                //     WmTaskTypeTree addTaskTypeTree41 = new WmTaskTypeTree();
+                //     addTaskTypeTree41.setTaskTypeId("41");
+                //     addTaskTypeTree41.setTaskTypeName("应收账款回款-C类");
+                //     tasktypeList.add(addTaskTypeTree40);
+                //     tasktypeList.add(addTaskTypeTree41);
+                // }
+                // // 如果存在taskTypeId=42 则同时增加手术跟台-一级/手术跟台-二级/手术跟台-三级任务类型（42/43/44）
+                // if (tasktypeList.stream().anyMatch(wmTaskTypeTree -> "42".equals(wmTaskTypeTree.getTaskTypeId()))) {
+                //     WmTaskTypeTree addTaskTypeTree43 = new WmTaskTypeTree();
+                //     addTaskTypeTree43.setTaskTypeId("43");
+                //     WmTaskTypeTree addTaskTypeTree44 = new WmTaskTypeTree();
+                //     addTaskTypeTree44.setTaskTypeId("44");
+                //     tasktypeList.add(addTaskTypeTree43);
+                //     tasktypeList.add(addTaskTypeTree44);
+                // }
+                // // 如果存在taskTypeId=47 47,库存调研 48,竞品调研  49,培训 50,使用情况调查
+                // if (tasktypeList.stream().anyMatch(wmTaskTypeTree -> "47".equals(wmTaskTypeTree.getTaskTypeId()))) {
+                //     WmTaskTypeTree addTaskTypeTree48 = new WmTaskTypeTree();
+                //     addTaskTypeTree48.setTaskTypeId("48");
+                //     WmTaskTypeTree addTaskTypeTree49 = new WmTaskTypeTree();
+                //     addTaskTypeTree49.setTaskTypeId("49");
+                //     WmTaskTypeTree addTaskTypeTree50 = new WmTaskTypeTree();
+                //     addTaskTypeTree50.setTaskTypeId("50");
+                //     tasktypeList.add(addTaskTypeTree48);
+                //     tasktypeList.add(addTaskTypeTree49);
+                //     tasktypeList.add(addTaskTypeTree50);
+                // }
                 // 如果存在taskTypeId=51 51,信用管理A  52,信用管理B 53,信用管理C
 //				if (tasktypeList.stream().anyMatch(wmTaskTypeTree -> "51".equals(wmTaskTypeTree.getTaskTypeId()))) {
 //					WmTaskTypeTree addTaskTypeTree51 = new WmTaskTypeTree();
@@ -1064,7 +1064,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
                     if (null == type.getChildren()) {
                         continue;
                     }
-                    if (type.getChildren() != null || type.getChildren().size() > 0) {
+                    if (CollUtil.isNotEmpty(type.getChildren())) {
                         List<WmTaskTypeTree> childtasktypeList = type.getChildren();
                         for (WmTaskTypeTree type1 : childtasktypeList) {
                             WmScoreTaskType wmScoreTaskType1 = new WmScoreTaskType();