权限功能调整

@@ -131,8 +131,10 @@ func buildSqlForAuditList(usercompanyid int64, companyid int64, userid int64) st
 		//指定部门
 		//指定部门
 		ids := []string{}
 		ids := []string{}
 		for _, v := range usrPermission.CheckOption.Departments {
 		for _, v := range usrPermission.CheckOption.Departments {
+			if v.OpenAll == 1 && v.OpenDepart == 1 && v.Wait == 1 {
 				ids = append(ids, fmt.Sprint(v.Id))
 				ids = append(ids, fmt.Sprint(v.Id))
 			}
 			}
+		}
 		if len(ids) > 0 {
 		if len(ids) > 0 {
 			log.Debug("命中规则：指定部门")
 			log.Debug("命中规则：指定部门")
 			sql4 = fmt.Sprintf(sql4, strings.Join(ids, ","))
 			sql4 = fmt.Sprintf(sql4, strings.Join(ids, ","))

@@ -165,6 +165,21 @@ func (p *OptionOpportunity) MergeObject(jsonString string) error {
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}
+	//-- 进行新旧数据兼容处理  ---
+	if obj.Check == OpportunityCheckLv3 {
+		for i := range obj.CheckOption.Departments {
+			obj.CheckOption.Departments[i].OpenAll = 1
+			obj.CheckOption.Departments[i].OpenDepart = 1
+			obj.CheckOption.Departments[i].Wait = 1
+		}
+	}
+	if obj.Check == OpportunityCheckLv5 {
+		for i := range obj.CheckOption.Departments {
+			obj.CheckOption.Departments[i].NotPass = 1
+		}
+	}
+	//--- 进行新旧数据兼容处理 结束--
+
 	if p.CheckMap == nil {
 	if p.CheckMap == nil {
 		p.CheckMap = make(map[int]int)
 		p.CheckMap = make(map[int]int)
 	}
 	}