Merge remote-tracking branch 'origin/master'

zhaowenxuan

7 天以前 0892d843cd394f383ff50f480f7f22f2ec3829bc

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java

@@ -276,7 +276,7 @@
    }

    private void getTjPackageList(List<TjPackage> tjPackageList) {
        if (null != tjPackageList && tjPackageList.size() > 0) {
        if (null != tjPackageList && !tjPackageList.isEmpty()) {
            for (TjPackage aPackage : tjPackageList) {
                List<TjProject> tjProjectList = new ArrayList<>();
                List<TjPackageProject> pplist = ppservice.getTjPackageProjectListByPacId(String.valueOf(aPackage.getPacId()));