|
@@ -1914,8 +1914,8 @@ func GetMoveEdbChartList(source, userId int, keyword, classify string, startSize
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-func MoveEdbChart(source, userId int, isSelectAll bool, dataId []string, keyword, classify string) (err error, errMsg string) {
|
|
+func MoveEdbChart(source, oldUserId, newUserId int, isSelectAll bool, dataId []string, keyword, classify string) (err error, errMsg string) {
|
|
- adminInfo, err := system.GetSysAdminById(userId)
|
|
+ adminInfo, err := system.GetSysAdminById(newUserId)
|
|
if err != nil {
|
|
if err != nil {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -1931,7 +1931,7 @@ func MoveEdbChart(source, userId int, isSelectAll bool, dataId []string, keyword
|
|
|
|
|
|
dataId = make([]string, 0)
|
|
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 {
|
|
if tmpErr != nil {
|
|
err = tmpErr
|
|
err = tmpErr
|
|
return
|
|
return
|
|
@@ -1953,14 +1953,14 @@ func MoveEdbChart(source, userId int, isSelectAll bool, dataId []string, keyword
|
|
|
|
|
|
if len(tmpList) > 0 {
|
|
if len(tmpList) > 0 {
|
|
for _, v := range tmpList {
|
|
for _, v := range tmpList {
|
|
- if v.UserId == userId {
|
|
+ if v.UserId == newUserId {
|
|
errMsg = "新创建人不可和原创建人一致"
|
|
errMsg = "新创建人不可和原创建人一致"
|
|
err = errors.New(errMsg)
|
|
err = errors.New(errMsg)
|
|
return
|
|
return
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- err = models.ModifyEdbinfoUserIdByCodeList(dataId, userId)
|
|
+ err = models.ModifyEdbinfoUserIdByCodeList(dataId, newUserId)
|
|
}
|
|
}
|
|
|
|
|
|
case 2:
|
|
case 2:
|
|
@@ -1971,7 +1971,7 @@ func MoveEdbChart(source, userId int, isSelectAll bool, dataId []string, keyword
|
|
}
|
|
}
|
|
if len(tmpList) > 0 {
|
|
if len(tmpList) > 0 {
|
|
for _, v := range tmpList {
|
|
for _, v := range tmpList {
|
|
- if v.SysUserId == userId {
|
|
+ if v.SysUserId == newUserId {
|
|
errMsg = "新创建人不可和原创建人一致"
|
|
errMsg = "新创建人不可和原创建人一致"
|
|
err = errors.New(errMsg)
|
|
err = errors.New(errMsg)
|
|
return
|
|
return
|
|
@@ -1988,7 +1988,7 @@ func MoveEdbChart(source, userId int, isSelectAll bool, dataId []string, keyword
|
|
}
|
|
}
|
|
if len(tmpList) > 0 {
|
|
if len(tmpList) > 0 {
|
|
for _, v := range tmpList {
|
|
for _, v := range tmpList {
|
|
- if v.SysUserId == userId {
|
|
+ if v.SysUserId == newUserId {
|
|
errMsg = "新创建人不可和原创建人一致"
|
|
errMsg = "新创建人不可和原创建人一致"
|
|
err = errors.New(errMsg)
|
|
err = errors.New(errMsg)
|
|
return
|
|
return
|
|
@@ -2014,7 +2014,7 @@ func MoveEdbChart(source, userId int, isSelectAll bool, dataId []string, keyword
|
|
}
|
|
}
|
|
if len(tmpList) > 0 {
|
|
if len(tmpList) > 0 {
|
|
for _, v := range tmpList {
|
|
for _, v := range tmpList {
|
|
- if v.SysUserId == userId {
|
|
+ if v.SysUserId == newUserId {
|
|
errMsg = "新创建人不可和原创建人一致"
|
|
errMsg = "新创建人不可和原创建人一致"
|
|
err = errors.New(errMsg)
|
|
err = errors.New(errMsg)
|
|
return
|
|
return
|