Merge branch 'PSM-10' into minhang

徐烜
2 parents 4dfd3a60 6b538425
Showing 1 changed file with 3 additions and 3 deletions
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
@@ -2250,11 +2250,11 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [
                             if (self.$$data_xl_first_init &&
                                 self.$$data_ry_first_init &&
                                 self.$$data_rycid_first_init &&
-                                self.$$data_rystart_first_init) {
+                                self.$$data_rystart_first_init && !self.$$data_init) {
                                 console.log("开始初始化数据");
  
                                 // 判定是否分班，字符串中包含-就是了
-                                if (self.$$data_ry_first_data.indexOf("-") != -1) { // 分班
+                                if (self.$$data_ry_first_data.indexOf("-") != -1 && dataFBSelect_temp.length == 0) { // 分班
                                     self.$$isFB = true;
  
                                     // 搭班编码、人员配置id
@@ -2290,7 +2290,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [
                                     scope[ctrlAs].$$dataFBSelectedStart = self.$$data_rystart_first_data - 1;
  
  
-                                } else {
+                                } else if (dataSelect_temp.length == 0) {
                                     self.$$isFB = false;
  
                                     // 搭班编码、人员配置id