|
@@ -1914,8 +1914,8 @@ func GetMoveEdbChartList(source, userId int, keyword, classify string, startSize
|
|
|
|
|
|
// MoveEdbChart 转移指标/图表创建人
|
|
|
// @param source 来源 :1:手工数据指标 2:钢联化工数据库 3:ETA指标库 4:ETA预测指标 5:图库
|
|
|
-func MoveEdbChart(source, userId int, isSelectAll bool, dataId []string, keyword, classify string) (err error, errMsg string) {
|
|
|
- adminInfo, err := system.GetSysAdminById(userId)
|
|
|
+func MoveEdbChart(source, oldUserId, newUserId int, isSelectAll bool, dataId []string, keyword, classify string) (err error, errMsg string) {
|
|
|
+ adminInfo, err := system.GetSysAdminById(newUserId)
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
@@ -1931,7 +1931,7 @@ func MoveEdbChart(source, userId int, isSelectAll bool, dataId []string, keyword
|
|
|
// 需要转义的指标/图表ID列表
|
|
|
dataId = make([]string, 0)
|
|
|
// 获取所有指标/图表
|
|
|
- list, _, tmpErr := GetMoveEdbChartList(source, userId, keyword, classify, 0, 100000)
|
|
|
+ list, _, tmpErr := GetMoveEdbChartList(source, oldUserId, keyword, classify, 0, 100000)
|
|
|
if tmpErr != nil {
|
|
|
err = tmpErr
|
|
|
return
|
|
@@ -1953,14 +1953,14 @@ func MoveEdbChart(source, userId int, isSelectAll bool, dataId []string, keyword
|
|
|
|
|
|
if len(tmpList) > 0 {
|
|
|
for _, v := range tmpList {
|
|
|
- if v.UserId == userId {
|
|
|
+ if v.UserId == newUserId {
|
|
|
errMsg = "新创建人不可和原创建人一致"
|
|
|
err = errors.New(errMsg)
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
// 修改创建人
|
|
|
- err = models.ModifyEdbinfoUserIdByCodeList(dataId, userId)
|
|
|
+ err = models.ModifyEdbinfoUserIdByCodeList(dataId, newUserId)
|
|
|
}
|
|
|
|
|
|
case 2: //钢联化工数据库
|
|
@@ -1971,7 +1971,7 @@ func MoveEdbChart(source, userId int, isSelectAll bool, dataId []string, keyword
|
|
|
}
|
|
|
if len(tmpList) > 0 {
|
|
|
for _, v := range tmpList {
|
|
|
- if v.SysUserId == userId {
|
|
|
+ if v.SysUserId == newUserId {
|
|
|
errMsg = "新创建人不可和原创建人一致"
|
|
|
err = errors.New(errMsg)
|
|
|
return
|
|
@@ -1988,7 +1988,7 @@ func MoveEdbChart(source, userId int, isSelectAll bool, dataId []string, keyword
|
|
|
}
|
|
|
if len(tmpList) > 0 {
|
|
|
for _, v := range tmpList {
|
|
|
- if v.SysUserId == userId {
|
|
|
+ if v.SysUserId == newUserId {
|
|
|
errMsg = "新创建人不可和原创建人一致"
|
|
|
err = errors.New(errMsg)
|
|
|
return
|
|
@@ -2014,7 +2014,7 @@ func MoveEdbChart(source, userId int, isSelectAll bool, dataId []string, keyword
|
|
|
}
|
|
|
if len(tmpList) > 0 {
|
|
|
for _, v := range tmpList {
|
|
|
- if v.SysUserId == userId {
|
|
|
+ if v.SysUserId == newUserId {
|
|
|
errMsg = "新创建人不可和原创建人一致"
|
|
|
err = errors.New(errMsg)
|
|
|
return
|