From 8990de33a3f6dd399b67f04a08dd1715e86500f5 Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Mon, 14 Sep 2020 08:50:42 +0800
Subject: [PATCH] 'commit'

---
 dsSupport/Model/Res.go                                 |  1 +
 .../AccessSystemController/AccessSystemController.go   |  3 ++-
 .../AccessSystem/AccessSystemDao/AccessSystemDao.go    | 10 +++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dsSupport/Model/Res.go b/dsSupport/Model/Res.go
index 9c0eea65..a9dd7b2a 100644
--- a/dsSupport/Model/Res.go
+++ b/dsSupport/Model/Res.go
@@ -9,4 +9,5 @@ type Res struct {
 	StudentFlag  interface{} `json:"studentFlag,omitempty"`  //omitempty有值就输出，没值则不输出
 	ParentFlag   interface{} `json:"parentFlag,omitempty"`   //omitempty有值就输出，没值则不输出
 	PositionList interface{} `json:"positionList,omitempty"` //omitempty有值就输出，没值则不输出
+	Id           interface{} `json:"id,omitempty"`           //omitempty有值就输出，没值则不输出
 }
diff --git a/dsSupport/MyModel/AccessSystem/AccessSystemController/AccessSystemController.go b/dsSupport/MyModel/AccessSystem/AccessSystemController/AccessSystemController.go
index 937e6c94..2cb81e04 100644
--- a/dsSupport/MyModel/AccessSystem/AccessSystemController/AccessSystemController.go
+++ b/dsSupport/MyModel/AccessSystem/AccessSystemController/AccessSystemController.go
@@ -100,7 +100,7 @@ func AddAccessSystemInfo(c *gin.Context) {
 	appCode := c.PostForm("appCode")
 	//排序号
 	sortId := CommonUtil.ConvertStringToInt32(c.PostForm("sortId"))
-	err := AccessSystemDao.AddApp(appCode, appName, sortId)
+	id, err := AccessSystemDao.AddApp(appCode, appName, sortId)
 	if err != nil {
 		c.JSON(http.StatusOK, Model.Res{
 			Success: false,
@@ -110,6 +110,7 @@ func AddAccessSystemInfo(c *gin.Context) {
 	}
 	c.JSON(http.StatusOK, Model.Res{
 		Success: true,
+		Id:      id,
 		Message: "操作成功！",
 	})
 }
diff --git a/dsSupport/MyModel/AccessSystem/AccessSystemDao/AccessSystemDao.go b/dsSupport/MyModel/AccessSystem/AccessSystemDao/AccessSystemDao.go
index cec6cd31..8234ce79 100644
--- a/dsSupport/MyModel/AccessSystem/AccessSystemDao/AccessSystemDao.go
+++ b/dsSupport/MyModel/AccessSystem/AccessSystemDao/AccessSystemDao.go
@@ -23,7 +23,7 @@ var db = DbUtil.Engine
 /**
 功能：增加一个接入系统
 */
-func AddApp(appCode string, appName string, sortId int32) error {
+func AddApp(appCode string, appName string, sortId int32) (string,error) {
 	//生成AK+SK
 	ak := xid.New()
 	appKey := ak.String() //新增就生成一个secret
@@ -35,7 +35,7 @@ func AddApp(appCode string, appName string, sortId int32) error {
 	list, _ := db.SQL(sql, appCode).Query().List()
 	count := list[0]["c"].(int64)
 	if count > 0 {
-		return errors.New("系统代码已存在，请重新输入！")
+		return "",errors.New("系统代码已存在，请重新输入！")
 	}
 	//插入数据库数据
 	model := new(models.TAppBase)
@@ -47,7 +47,7 @@ func AddApp(appCode string, appName string, sortId int32) error {
 	if sortId == 0 {
 		c, err := getMaxSortId()
 		if err != nil {
-			return err
+			return model.AppId,err
 		}
 		sortId = int32(c)
 	}
@@ -55,11 +55,11 @@ func AddApp(appCode string, appName string, sortId int32) error {
 	model.BUse = 1
 	_, err := db.Insert(model)
 	if err != nil {
-		return err
+		return model.AppId,err
 	}
 	//插入REDIS缓存
 	err = insertRedisCache(model.AccessKey, model.SecretKey, model.RedirectUri)
-	return err
+	return model.AppId,err
 }
 
 /**