bug 修复

@@ -158,7 +158,9 @@ 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 {
-			ids = append(ids, fmt.Sprint(v.Id))
+			if v.NotPass > 0 {
+				ids = append(ids, fmt.Sprint(v.Id))
+			}
 		}
 		}
 		if len(ids) > 0 {
 		if len(ids) > 0 {
 			log.Debug("命中规则：指定部门未通过")
 			log.Debug("命中规则：指定部门未通过")

@@ -187,6 +187,9 @@ func (p *OptionOpportunity) MergeObject(jsonString string) error {
 			if obj.CheckOption.Departments[k].Wait > departMap[i].Wait {
 			if obj.CheckOption.Departments[k].Wait > departMap[i].Wait {
 				departMap[i].Wait = obj.CheckOption.Departments[k].Wait
 				departMap[i].Wait = obj.CheckOption.Departments[k].Wait
 			}
 			}
+			if obj.CheckOption.Departments[k].NotPass > departMap[i].NotPass {
+				departMap[i].NotPass = obj.CheckOption.Departments[k].NotPass
+			}
 		} else {
 		} else {
 
 
 			departMap[i] = &obj.CheckOption.Departments[k]
 			departMap[i] = &obj.CheckOption.Departments[k]