|
@@ -116,12 +116,15 @@ func (s *groupService) Delete(id int) error {
|
|
|
// 构造视图层models
|
|
|
func makeGroupVM(projectCM *models.CmGroup) viewmodels.Group {
|
|
|
modelsVM := viewmodels.Group{}
|
|
|
+ permission := []string{}
|
|
|
id, _ := comm.AesEncrypt(strconv.Itoa(projectCM.Id), conf.SignSecret)
|
|
|
// userId, _ := comm.AesEncrypt(strconv.Itoa(projectCM.UserId), conf.SignSecret)
|
|
|
|
|
|
modelsVM.Id = id
|
|
|
modelsVM.Name = projectCM.Name
|
|
|
modelsVM.Remark = projectCM.Remark
|
|
|
+ json.Unmarshal([]byte(projectCM.Permission), &permission)
|
|
|
+ modelsVM.Permission = permission
|
|
|
|
|
|
if !projectCM.CreateTime.IsZero() {
|
|
|
modelsVM.CreateTime = projectCM.CreateTime.Format(conf.SysTimeform)
|