Browse Source

feature:修改个人表格配置数据重复问题

ZZH-wl 1 năm trước cách đây
mục cha
commit
0fb588c746

+ 1 - 1
opms_admin/app/service/sys_user.go

@@ -474,7 +474,7 @@ func (s *UserService) UpdateUser(req *model.EditUserReq) (err error) {
 func (s *UserService) ResetUserPwd(req *model.SysResetPwdReq) error {
 func (s *UserService) ResetUserPwd(req *model.SysResetPwdReq) error {
 	// 校验用户是否有修改权限
 	// 校验用户是否有修改权限
 	arr := garray.NewStrArrayFrom(s.CxtUser.Roles, true)
 	arr := garray.NewStrArrayFrom(s.CxtUser.Roles, true)
-	if !arr.Contains("SysAdmin") {
+	if !arr.Contains("SysAdmin") && !arr.Contains("Admin") {
 		return myerrors.TipsError("权限不足")
 		return myerrors.TipsError("权限不足")
 	}
 	}
 	salt := grand.S(10)
 	salt := grand.S(10)

+ 9 - 0
opms_parent/app/service/plat/plat_tablecols_config.go

@@ -40,6 +40,15 @@ func (s *TableColsConfigService) Save(req *model.PlatTablecolsConfigReq) (lastId
 	service.SetCreatedInfo(config, s.GetCxtUserId(), s.GetCxtUserName())
 	service.SetCreatedInfo(config, s.GetCxtUserId(), s.GetCxtUserName())
 	// 填充更新信息
 	// 填充更新信息
 	service.SetUpdatedInfo(config, s.GetCxtUserId(), s.GetCxtUserName())
 	service.SetUpdatedInfo(config, s.GetCxtUserId(), s.GetCxtUserName())
+
+	if config.Id == 0 {
+		updateId, err := s.Dao.Where(s.Dao.C.UserId, s.GetCxtUserId()).Where(s.Dao.C.Table, req.Table).OrderDesc(s.Dao.C.Id).Value(s.Dao.C.Id)
+		if err != nil {
+			return 0, err
+		}
+		config.Id = updateId.Int()
+	}
+
 	var result sql.Result
 	var result sql.Result
 	if config.Id != 0 {
 	if config.Id != 0 {
 		updateFieldEx := append(service.UpdateFieldEx, s.Dao.C.UserId)
 		updateFieldEx := append(service.UpdateFieldEx, s.Dao.C.UserId)