|
|
@@ -1107,7 +1107,7 @@ func MoveEdbClassify(req data_manage.MoveEdbClassifyReq, sysUser *system.Admin,
|
|
|
err = errors.New("获取分类信息失败,Err:" + err.Error())
|
|
|
return
|
|
|
}
|
|
|
- if edbClassifyInfo.SysUserId != sysUser.AdminId {
|
|
|
+ if edbClassifyInfo.ClassifyType != utils.EdbClassifyTypeBase && edbClassifyInfo.SysUserId != sysUser.AdminId {
|
|
|
errMsg = "不是本人目录，您没有操作权限"
|
|
|
err = errors.New(errMsg)
|
|
|
return
|
|
|
@@ -1567,8 +1567,15 @@ func moveEdbClassify(parentEdbClassifyInfo, edbClassifyInfo, prevClassify, nextC
|
|
|
|
|
|
oldClassifyIdPath := edbClassifyInfo.ClassifyIdPath
|
|
|
oldClassifyNamePath := edbClassifyInfo.ClassifyNamePath
|
|
|
- newClassifyNamePath := fmt.Sprint(parentEdbClassifyInfo.ClassifyNamePath, `|`, edbClassifyInfo.ClassifyName)
|
|
|
- newClassifyIdPath := fmt.Sprint(parentEdbClassifyInfo.ClassifyIdPath, `,`, edbClassifyInfo.ClassifyId)
|
|
|
+
|
|
|
+ newClassifyIdPath := oldClassifyIdPath
|
|
|
+ newClassifyNamePath := oldClassifyNamePath
|
|
|
+
|
|
|
+ // 如果不是一级的话，那么就需要更新路径
|
|
|
+ if parentEdbClassifyInfo != nil {
|
|
|
+ newClassifyIdPath = fmt.Sprint(parentEdbClassifyInfo.ClassifyIdPath, `,`, edbClassifyInfo.ClassifyId)
|
|
|
+ newClassifyNamePath = fmt.Sprint(parentEdbClassifyInfo.ClassifyNamePath, `|`, edbClassifyInfo.ClassifyName)
|
|
|
+ }
|
|
|
|
|
|
//更新
|
|
|
if len(updateCol) > 0 {
|
