Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

wyu

2022-01-07 b201e6603d0c26c113b2f845a897d6acce498ef1

 src/main/webapp/scripts/app/issue/issueImportExcel.controller.js

@@ -94,9 +94,9 @@
                        return false;
                    }

                    if ($scope.vm.form.issues == null || $scope.vm.form.issues.length === 0) {
                    /*if ($scope.vm.form.issues == null || $scope.vm.form.issues.length === 0) {
                        return false;
                    }
                    }*/

                    if ($scope.vm.form.file.length < 1) {
                        return true;
@@ -117,7 +117,13 @@
                            content : {
                                projectId : $scope.vm.form.projects[0].id,
                                issueTypeId : $scope.vm.form.issueTypeId,
                                parentIssueId : $scope.vm.form.issues[0].id
                                parentIssueId : (function () {
                                    var id = -1;
                                    if ($scope.vm.form.issues != null) {
                                        id = $scope.vm.form.issues[0].id
                                    }
                                    return id;
                                })()
                            }
                        },
                        fileFormDataName : "file"