Эх сурвалжийг харах

feature(优化): 大项目经理权限优化

ZZH-wl 2 жил өмнө
parent
commit
f8460b64e9

+ 4 - 2
opms_parent/app/dao/plat/internal/plat_followup.go

@@ -816,12 +816,14 @@ func (d *PlatFollowupDao) checkColumnsName(dataScope map[string]interface{}, arg
 		}
 	}
 	bigColumns := "is_big"
-	if isBig, ok := dataScope[bigColumns]; ok && isBig.(bool) {
+	if isBig, ok := dataScope[bigColumns]; ok {
 		if bigCol, ok := colsContrast[bigColumns]; ok {
 			orColsMap[bigCol.(string)] = isBig
 			delete(colsContrast, bigCol.(string))
 		} else {
-			orColsMap[tableAs+bigColumns] = isBig
+			if ok, _ := d.M.HasField(bigColumns); ok && specialFlag {
+				orColsMap[tableAs+bigColumns] = isBig
+			}
 		}
 	}
 

+ 4 - 2
opms_parent/app/dao/work/internal/work_order.go

@@ -826,12 +826,14 @@ func (d *WorkOrderDao) checkColumnsName(dataScope map[string]interface{}, args .
 		}
 	}
 	bigColumns := "is_big"
-	if isBig, ok := dataScope[bigColumns]; ok && isBig.(bool) {
+	if isBig, ok := dataScope[bigColumns]; ok {
 		if bigCol, ok := colsContrast[bigColumns]; ok {
 			orColsMap[bigCol.(string)] = isBig
 			delete(colsContrast, bigCol.(string))
 		} else {
-			orColsMap[tableAs+bigColumns] = isBig
+			if ok, _ := d.M.HasField(bigColumns); ok && specialFlag {
+				orColsMap[tableAs+bigColumns] = isBig
+			}
 		}
 	}
 

+ 1 - 1
opms_parent/app/service/cust/cust_customer.go

@@ -183,7 +183,7 @@ func (s *CustomerService) Create(req *model.CustomerAddSeq) (insertId int64, err
 			break
 		}
 	}
-	if isBig, ok := s.DataScope["is_big"]; ok && isBig.(bool) {
+	if _, ok := s.DataScope["is_big"]; ok {
 		isSales = true
 	}