0822PM

controllers/cases/caseuser.go

@@ -5,8 +5,10 @@ import "spaceofcheng/services/models/model"
 // GetCaseUserByCase 根据案场获取用户信息
 func (c *CaseController) GetCaseUserByCase() {
 	caseid := c.GetString("caseid")
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
 
-	list, err := c.dao.GetCaseUserByCase(caseid)
+	list, err := c.dao.GetCaseUserByCase(caseid, page, pageSize)
 
 	if err != nil {
 		c.ResponseError(err)

controllers/message/cmscase.go

@@ -60,3 +60,23 @@ func (c *MessageController) DelCmsCase() {
 	}
 	c.ResponseJSON("删除成功！")
 }
+
+// CmsCaseShow 前台展示
+func (c *MessageController) CmsCaseShow() {
+	cmscaseid := c.GetString(":cmscaseid")
+	err := c.dao.CmsCaseShow(cmscaseid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("操作成功！")
+}
+
+// CmsCaseHide 前台隐藏
+func (c *MessageController) CmsCaseHide() {
+	cmscaseid := c.GetString(":cmscaseid")
+	err := c.dao.CmsCaseHide(cmscaseid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("操作成功！")
+}

controllers/message/news.go

@@ -1,6 +1,8 @@
 package message
 
-import "spaceofcheng/services/models/model"
+import (
+	"spaceofcheng/services/models/model"
+)
 
 // GetNews 获取咨询列表
 func (c *MessageController) GetNews() {

controllers/system/role.go

@@ -25,8 +25,10 @@ func (c *RoleController) GetRoleList() {
 	caseIDs := c.GetCaseIDs(cases)
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
+	name := c.GetString("name")
+	caseid := c.GetString("caseid")
 
-	list, err := c.dao.GetRoleList(caseIDs, page, pageSize)
+	list, err := c.dao.GetRoleList(caseIDs, name, caseid, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
 	}
@@ -49,14 +51,24 @@ func (c *RoleController) SaveCaseRole() {
 	if err := c.ParseForm(&role); err != nil {
 		c.ResponseError(err)
 	}
-	menuids := c.GetString("menuids")
-	newRole, err := c.dao.SaveRole(role, menuids)
+	newRole, err := c.dao.SaveRole(role)
 	if err != nil {
 		c.ResponseError(err)
 	}
 	c.ResponseJSON(newRole)
 }
 
+// SaveRoleMenus 保存角色对应菜单
+func (c *RoleController) SaveRoleMenus() {
+	roleid := c.GetString(":roleid")
+	menuids := c.GetString("menuids")
+	err := c.dao.SaveRoleMenu(roleid, menuids)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("保存成功！")
+}
+
 // DelCaseRole 删除角色
 func (c *RoleController) DelCaseRole() {
 	roleid := c.GetString(":roleid")

controllers/user/user.go

@@ -213,3 +213,16 @@ func (c *UserController) GetEnvVars() {
 
 	c.ResponseJSON(vars)
 }
+
+// GetUserRole 获取用户角色
+func (c *UserController) GetUserRole() {
+	userid := c.GetString("userid")
+	roles, err := c.dao.GetUserRoles(userid)
+	if err != nil {
+		c.ResponseError(
+			err,
+			http.StatusInternalServerError,
+		)
+	}
+	c.ResponseJSON(roles)
+}

models/cases/cases.go

@@ -40,7 +40,7 @@ func (m *CaseDAO) GetCaseList(caseids, casename string, page, pageSize int) ([]C
 		sql = sql + ` and  a.case_name like '%` + casename + `%'`
 	}
 
-	sql = sql + " order by create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa((page+1)*pageSize)
+	sql = sql + " order by create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(page*pageSize)
 
 	err := m.db.Sql(sql).Find(&cases)
 	return cases, err

models/cases/caseuser.go

@@ -9,12 +9,22 @@ import (
 )
 
 // GetCaseUserByCase 根据案场id获取案场相关人员
-func (m *CaseDAO) GetCaseUserByCase(caseid string) ([]model.SysCaseUser, error) {
+func (m *CaseDAO) GetCaseUserByCase(caseid string, page int, pageSize int) ([]model.SysCaseUser, error) {
 	var caseusers []model.SysCaseUser
-	err := m.db.Where("case_id=?", caseid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&caseusers)
+	err := m.db.Where("case_id=?", caseid).And("status>"+strconv.Itoa(models.STATUS_DEL)).Limit(pageSize, (page-1)*pageSize).Find(&caseusers)
 	return caseusers, err
 }
 
+// GetCaseUserCount 列表数量
+func (m *CaseDAO) GetCaseUserCount(caseid string) (int, error) {
+	var caseusers []model.SysCaseUser
+	err := m.db.Where("case_id=?", caseid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&caseusers)
+	if err != nil {
+		return 0, err
+	}
+	return len(caseusers), nil
+}
+
 // GetCaseUserByID 根据id获取相关人员
 func (m *CaseDAO) GetCaseUserByID(userid string) (*model.SysCaseUser, error) {
 	var caseusers []model.SysCaseUser

models/channel/channel.go

@@ -45,7 +45,7 @@ func (m *ChannelDAO) GetChannels(caseid string, page int, pageSize int) ([]Chann
 	select a.*,b.case_name 
 	from ta_channel a 
 	inner join sys_case b on a.case_id = b.case_id 
-	where a.case_id in(` + strings.Replace(caseid, ",", "','", -1) + `) and status > ` + strconv.Itoa(models.STATUS_DEL)
+	where a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `') and b.status> ` + strconv.Itoa(models.STATUS_DEL) + ` and  a.status > ` + strconv.Itoa(models.STATUS_DEL)
 	err := m.db.Sql(sql).Find(&channels)
 	return channels, err
 }

models/message/cmscase.go

@@ -19,13 +19,17 @@ type CmsCaseInfo struct {
 	CaseName        string
 }
 
+const (
+	STATUS_NOSHOW = 0
+)
+
 // GetCmsCaseList 获取项目专题列表
 func (m *MessageDAO) GetCmsCaseList(name, caseids string, page int, pageSize int) ([]CmsCaseInfo, error) {
 	var cases []CmsCaseInfo
 	sql := `select a.*,b.case_name from ta_cms_case a inner join sys_case b on a.case_id = b.case_id 
 	where a.org_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and a.name like '%` + name + `%' and a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
 	and b.status > ` + strconv.Itoa(models.STATUS_DEL) + `
-	order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa((page+1)*pageSize)
+	order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(page*pageSize)
 	err := m.db.Sql(sql).Find(&cases)
 	return cases, err
 }
@@ -159,3 +163,27 @@ func (m *MessageDAO) SaveCmsCaseImg(img model.TaCmsCaseImage) error {
 	_, err := m.db.Insert(img)
 	return err
 }
+
+// CmsCaseShow 前台展示
+func (m *MessageDAO) CmsCaseShow(cmscaseid string) error {
+	var cmscase = model.TaCmsCase{}
+	cmscase.Status = models.STATUS_NORMAL
+	cmscase.CmsCaseId = cmscaseid
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("cms_case_id=?", cmscase.CmsCaseId).Update(cmscase)
+	return err
+}
+
+// CmsCaseHide 前台隐藏
+func (m *MessageDAO) CmsCaseHide(cmscaseid string) error {
+	var cmscase = model.TaCmsCase{}
+	cmscase.Status = STATUS_NOSHOW
+	cmscase.CmsCaseId = cmscaseid
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("cms_case_id=?", cmscase.CmsCaseId).Update(cmscase)
+	return err
+}

models/message/news.go

@@ -25,13 +25,13 @@ func (m *MessageDAO) GetNewsList(locationid, orgid string, page int, pageSize in
 		select b.news_id,GROUP_CONCAT(a.location_name) location_names,GROUP_CONCAT(a.location_id) location_ids 
 		from td_cms_image_location a inner join ta_cms_location b on a.location_id=b.location_id and a.status>` + strconv.Itoa(models.STATUS_DEL) +
 		` and a.org_id='` + orgid + `' group by b.news_id
-		) c on new.news_id = c.news_id and new.status>` + strconv.Itoa(models.STATUS_DEL) + ` and new.org_id='` + orgid + `'`
+		) c on new.news_id = c.news_id WHERE new.status>` + strconv.Itoa(models.STATUS_DEL) + ` and new.org_id='` + orgid + `'`
 
 	if locationid != "" {
 		sql += ` and new.news_id in (select news_id from ta_cms_location where location_id='` + locationid + `')`
 	}
 
-	sql = sql + " order by new.create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa((page+1)*pageSize)
+	sql = sql + " order by new.create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(page*pageSize)
 	err := m.db.Sql(sql).Find(&news)
 	return news, err
 }
@@ -103,7 +103,7 @@ func (m *MessageDAO) DelNewsLocation(newsid string) error {
 
 // SaveNewsLocation 保存咨询与位置映射
 func (m *MessageDAO) SaveNewsLocation(newsid, locationsid string) error {
-	sql := `insert into ta_cms_location(location_id,news_id) select '` + newsid + `', location_id from td_cms_image_location where location_id in ('` + strings.Replace(locationsid, ",", "','", -1) + `') and status > ` + strconv.Itoa(models.STATUS_DEL)
+	sql := `insert into ta_cms_location(news_id,location_id) select '` + newsid + `', location_id from td_cms_image_location where location_id in ('` + strings.Replace(locationsid, ",", "','", -1) + `') and status > ` + strconv.Itoa(models.STATUS_DEL)
 	_, err := m.db.Exec(sql)
 	return err
 }
@@ -131,6 +131,6 @@ func (m *MessageDAO) DelNews(newsid string) error {
 	var cols = []string{
 		"status",
 	}
-	_, err := m.db.Cols(cols...).Where("user_id=?", news.NewsId).Update(news)
+	_, err := m.db.Cols(cols...).Where("news_id=?", news.NewsId).Update(news)
 	return err
 }

models/system/role.go

@@ -26,23 +26,37 @@ func NewRoleDAO(ctx *utils.Context) *RoleDAO {
 }
 
 // GetRoleCount 获取角色总数
-func (m *RoleDAO) GetRoleCount(caseids string) (int, error) {
+func (m *RoleDAO) GetRoleCount(caseids, name, caseid string) (int, error) {
 	var roles []model.SysRole
-	err := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&roles)
+	dao := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
+	if name != "" {
+		dao.And("role_name like '%" + name + "%'")
+	}
+	if caseid != "" {
+		dao.And("case_id =?", caseid)
+	}
+	err := dao.Find(&roles)
 	return len(roles), err
 }
 
 // GetRoleList 根据案场获取角色
-func (m *RoleDAO) GetRoleList(caseids string, page int, pageSize int) ([]model.SysRole, error) {
+func (m *RoleDAO) GetRoleList(caseids, name, caseid string, page int, pageSize int) ([]model.SysRole, error) {
 	var roles []model.SysRole
-	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, (page-1)*pageSize).Desc("create_date").Find(&roles)
+	dao := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
+	if name != "" {
+		dao.And("role_name like '%" + name + "%'")
+	}
+	if caseid != "" {
+		dao.And("case_id =?", caseid)
+	}
+	err := dao.Limit(pageSize, (page-1)*pageSize).Desc("create_date").Find(&roles)
 	return roles, err
 }
 
 // Role 角色
 type Role struct {
-	model.TaCmsCase `xorm:"extends"`
-	RoleMenu        []model.SysMenu
+	model.SysRole `xorm:"extends"`
+	RoleMenu      []model.SysMenu
 }
 
 // GetRoleByID 根据ID获取角色
@@ -107,8 +121,8 @@ func (m *RoleDAO) DelRoleMenu(roleid string) error {
 }
 
 // SaveRoleMenu 保存角色对应的菜单
-func (m *RoleDAO) SaveRoleMenu(roleid, caseids string) error {
-	sql := `insert into sys_role_menu(role_id,menu_id) select '` + roleid + `', menu_id from sys_menu where case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and status > ` + strconv.Itoa(models.STATUS_DEL)
+func (m *RoleDAO) SaveRoleMenu(roleid, menuids string) error {
+	sql := `insert into sys_role_menu(role_id,menu_id) select '` + roleid + `', menu_id from sys_menu where menu_id in ('` + strings.Replace(menuids, ",", "','", -1) + `') and status > ` + strconv.Itoa(models.STATUS_DEL)
 	_, err := m.db.Exec(sql)
 	return err
 }

models/system/user.go

@@ -40,49 +40,30 @@ func (m *UserDAO) GetUserList(username, typeid, caseids string, page int, pageSi
 		select a.user_id,GROUP_CONCAT(b.type_name) as user_type_names from sys_user_type a
 		INNER join td_user_type b on a.type_id = b.type_id
 		group by a.user_id) c on user.user_id = c.user_id where 
-		(status> ` + strconv.Itoa(models.STATUS_DEL) + ` and user_name like '%` + username + `%' and user_id in 
+		(status> ` + strconv.Itoa(models.STATUS_DEL) + ` and user_name like '%` + username + `%' and user.user_id in 
 		(select user_id from sys_user_tag a inner join sys_tag_case b on a.tag_id=b.tag_id where b.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')))`
 
 	if typeid != "" {
-		sql = sql + " and user_id in (select user_id from sys_user_type where type_id = '" + typeid + "')"
+		sql = sql + " and user.user_id in (select user_id from sys_user_type where type_id = '" + typeid + "')"
 	}
 
-	sql = sql + " order by create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa((page+1)*pageSize)
-
+	sql = sql + " order by create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(page*pageSize)
 	err := m.db.Sql(sql).Find(&users)
 	return users, err
-
-	// var users []model.SysUser
-	// userDAO := m.db.Where(`(status> `+strconv.Itoa(models.STATUS_DEL)+` and user_name like '%?%' and user_id in
-	// 	(select user_id from sys_user_tag a inner join sys_tag_case b on a.tag_id=b.tag_id where b.case_id in ('?')))`, username, strings.Replace(caseids, ",", "','", -1))
-
-	// if typeid != "" {
-	// 	userDAO.In("user_id", builder.Select("user_id").From("sys_user_type").Where(builder.Eq{"type_id": typeid}))
-	// }
-	// err := userDAO.Limit(pageSize, (page-1)*pageSize).Desc("create_date").Find(&users)
-	// return users, err
 }
 
 // GetUserCount 用户列表count
 func (m *UserDAO) GetUserCount(username, typeid, caseids string) (int, error) {
-	// var users []model.SysUser
-	// userDAO := m.db.Where(`(status> `+strconv.Itoa(models.STATUS_DEL)+` and user_name like '%?%' and user_id in
-	// 	(select user_id from sys_user_tag a inner join sys_tag_case b on a.tag_id=b.tag_id where b.case_id in ('?')))`, username, strings.Replace(caseids, ",", "','", -1))
-
-	// if typeid != "" {
-	// 	userDAO.In("user_id", builder.Select("user_id").From("sys_user_type").Where(builder.Eq{"type_id": typeid}))
-	// }
-	// err := userDAO.Find(&users)
 	var users []UserListInfo
 	sql := `select user.*,c.user_type_names from sys_user user left join (
 		select a.user_id,GROUP_CONCAT(b.type_name) as user_type_names from sys_user_type a
 		INNER join td_user_type b on a.type_id = b.type_id
 		group by a.user_id) c on user.user_id = c.user_id where 
-		(status> ` + strconv.Itoa(models.STATUS_DEL) + ` and user_name like '%` + username + `%' and user_id in 
+		(status> ` + strconv.Itoa(models.STATUS_DEL) + ` and user_name like '%` + username + `%' and user.user_id in 
 		(select user_id from sys_user_tag a inner join sys_tag_case b on a.tag_id=b.tag_id where b.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')))`
 
 	if typeid != "" {
-		sql = sql + " and user_id in (select user_id from sys_user_type where type_id = '" + typeid + "')"
+		sql = sql + " and user.user_id in (select user_id from sys_user_type where type_id = '" + typeid + "')"
 	}
 	err := m.db.Sql(sql).Find(&users)
 	if err != nil {
@@ -96,7 +77,7 @@ type UserInfo struct {
 	model.SysUser `xorm:"extends"`
 	UserType      []model.TdUserType
 	UserTag       []model.SysTag
-	UserCase      []model.SysCase
+	UserCase      []model.SysUserCase
 	UserRole      []model.SysRole
 	UserMenu      []model.SysMenu
 }
@@ -111,13 +92,16 @@ type SysUserForm struct {
 
 // GetUserByID 根据ID获取用户信息
 func (m *UserDAO) GetUserByID(userid string) (*UserInfo, error) {
-	var userinfo = UserInfo{}
+	var userinfo []UserInfo
 	sql := `select * from sys_user where user_id='` + userid + `' and status>` + strconv.Itoa(models.STATUS_DEL)
 	err := m.db.Sql(sql).Find(&userinfo)
 	if err != nil {
 		return nil, err
 	}
-	return &userinfo, nil
+	if len(userinfo) > 0 {
+		return &userinfo[0], nil
+	}
+	return nil, nil
 }
 
 // GetUserTypes 获取所有的用户类型
@@ -142,8 +126,9 @@ func (m *UserDAO) GetUserTag(userid string) ([]model.SysTag, error) {
 }
 
 // GetUserCase 获取用户案场
-func (m *UserDAO) GetUserCase(userid string) ([]model.SysCase, error) {
-	var userCase []model.SysCase
+func (m *UserDAO) GetUserCase(userid string) ([]model.SysUserCase, error) {
+	var userCase []model.SysUserCase
+	// err := m.db.Where("user_id=?", userid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&userCase)
 	err := m.db.In("case_id", builder.Select("case_id").From("sys_user_case").Where(builder.Eq{"user_id": userid}).And(builder.Gt{"status": models.STATUS_DEL})).Find(&userCase)
 	return userCase, err
 }

routers/common.go

@@ -35,6 +35,9 @@ func getCommonRoutes() beego.LinkNamespace {
 		// 系统用户
 		beego.NSRouter("/user", &user.UserController{}, "get:GetUserList"),
 		beego.NSRouter("/user/:userid", &user.UserController{}, "get:GetUserByID"),
+		beego.NSRouter("/user", &user.UserController{}, "post:SaveUser"),
+		beego.NSRouter("/user", &user.UserController{}, "put:SaveUser"),
+		beego.NSRouter("/user/:userid", &user.UserController{}, "delete:DelUser"),
 		beego.NSRouter("/user/:userid/password", &user.UserController{}, "put:UpdatePassword"),
 		beego.NSRouter("/user/password/reset", &user.UserController{}, "put:ResetPassword"),
 		beego.NSRouter("/signout", &user.UserController{}, "post:SignOut"),
@@ -42,6 +45,10 @@ func getCommonRoutes() beego.LinkNamespace {
 		// 用户类型
 		beego.NSRouter("/usertype", &user.UserController{}, "get:GetUserTypes"),
 
+		// 用户角色
+		beego.NSRouter("/userrole", &user.UserController{}, "get:GetUserRole"),
+		beego.NSRouter("/userrole", &user.UserController{}, "put:UserMapRole"),
+
 		// cms 位置
 		beego.NSRouter("/cms/location", &message.MessageController{}, "get:GetLocations"),
 		beego.NSRouter("/cms/location/:locationid", &message.MessageController{}, "get:GetLocationById"),
@@ -76,6 +83,8 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/cms/case", &message.MessageController{}, "post:SaveCmsCase"),
 		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "put:SaveCmsCase"),
 		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "delete:DelCmsCase"),
+		beego.NSRouter("/cms/caseshow/:cmscaseid", &message.MessageController{}, "put:CmsCaseShow"),
+		beego.NSRouter("/cms/casehide/:cmscaseid", &message.MessageController{}, "put:CmsCaseHide"),
 
 		// tag 标签
 		beego.NSRouter("/case/tag", &cases.CaseController{}, "get:GetTagList"),
@@ -139,6 +148,8 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/role", &system.RoleController{}, "put:SaveCaseRole"),
 		beego.NSRouter("/role/:roleid", &system.RoleController{}, "delete:DelCaseRole"),
 
+		beego.NSRouter("/rolemenu/:roleid", &system.RoleController{}, "put:SaveRoleMenus"),
+
 		// course 课程
 		beego.NSRouter("/course/taglist", &course.CourseController{}, "get:GetCourseTagsByPage"),
 		beego.NSRouter("/course/tag", &course.CourseController{}, "get:GetCourseTags"),

service/cases/caseuser.go

@@ -2,13 +2,37 @@ package cases
 
 import (
 	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
+
+	"github.com/astaxie/beego"
 )
 
 // GetCaseUserByCase 根据案场id获取案场相关人员信息
-func (s *CaseServ) GetCaseUserByCase(caseid string) ([]model.SysCaseUser, error) {
-	caseusers, err := s.dao.GetCaseUserByCase(caseid)
-	return caseusers, err
+func (s *CaseServ) GetCaseUserByCase(caseid string, page int, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	if page == 0 {
+		page = 1
+	}
+	caseusers, err := s.dao.GetCaseUserByCase(caseid, page, pageSize)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+	total, err := s.dao.GetCaseUserCount(caseid)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+
+	return map[string]interface{}{
+		"list":     caseusers,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, err
 }
 
 // GetCaseUserByType 根据类型获取人员

service/message/cmscase.go

@@ -114,32 +114,36 @@ func (s *MessageServ) SaveCmsCase(cmscase model.TaCmsCase, courseids, imgs, deta
 		return nil, err
 	}
 
-	arrimg := strings.Split(imgs, ",")
-	for index, img := range arrimg {
-		CmsImg := model.TaCmsCaseImage{
-			ImageType:    models.IMAGETYPE_COVER,
-			Sort:         (index + 1),
-			CaseImageUrl: img,
-			CmsCaseId:    newInfo.CmsCaseId,
-		}
-		err = s.dao.SaveCmsCaseImg(CmsImg)
-		if err != nil {
-			beego.Error(err)
-			return nil, err
+	if imgs != "" {
+		arrimg := strings.Split(imgs, ",")
+		for index, img := range arrimg {
+			CmsImg := model.TaCmsCaseImage{
+				ImageType:    models.IMAGETYPE_COVER,
+				Sort:         (index + 1),
+				CaseImageUrl: img,
+				CmsCaseId:    newInfo.CmsCaseId,
+			}
+			err = s.dao.SaveCmsCaseImg(CmsImg)
+			if err != nil {
+				beego.Error(err)
+				return nil, err
+			}
 		}
 	}
-	arrdetailimg := strings.Split(detailimgs, ",")
-	for index, img := range arrdetailimg {
-		CmsImg := model.TaCmsCaseImage{
-			ImageType:    models.IMAGETYPE_DETAIL,
-			Sort:         (index + 1),
-			CaseImageUrl: img,
-			CmsCaseId:    newInfo.CmsCaseId,
-		}
-		err = s.dao.SaveCmsCaseImg(CmsImg)
-		if err != nil {
-			beego.Error(err)
-			return nil, err
+	if detailimgs != "" {
+		arrdetailimg := strings.Split(detailimgs, ",")
+		for index, img := range arrdetailimg {
+			CmsImg := model.TaCmsCaseImage{
+				ImageType:    models.IMAGETYPE_DETAIL,
+				Sort:         (index + 1),
+				CaseImageUrl: img,
+				CmsCaseId:    newInfo.CmsCaseId,
+			}
+			err = s.dao.SaveCmsCaseImg(CmsImg)
+			if err != nil {
+				beego.Error(err)
+				return nil, err
+			}
 		}
 	}
 	return newInfo, err
@@ -150,3 +154,15 @@ func (s *MessageServ) DelCmsCase(cmscaseid string) error {
 	err := s.dao.DelCmsCase(cmscaseid)
 	return err
 }
+
+// CmsCaseShow 前台展示
+func (s *MessageServ) CmsCaseShow(cmscaseid string) error {
+	err := s.dao.CmsCaseShow(cmscaseid)
+	return err
+}
+
+// CmsCaseHide 前台隐藏
+func (s *MessageServ) CmsCaseHide(cmscaseid string) error {
+	err := s.dao.CmsCaseHide(cmscaseid)
+	return err
+}

service/system/role.go

@@ -24,19 +24,19 @@ func NewRoleServ(ctx *utils.Context) *RoleServ {
 }
 
 // GetRoleList 获取Role列表
-func (s *RoleServ) GetRoleList(caseids string, page, pageSize int) (map[string]interface{}, error) {
+func (s *RoleServ) GetRoleList(caseids, name, caseid string, page, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
 	if page == 0 {
 		page = 1
 	}
-	roles, err := s.dao.GetRoleList(caseids, page, pageSize)
+	roles, err := s.dao.GetRoleList(caseids, name, caseid, page, pageSize)
 	if err != nil {
 		beego.Error(err)
 		return nil, err
 	}
-	total, err := s.dao.GetRoleCount(caseids)
+	total, err := s.dao.GetRoleCount(caseids, name, caseid)
 	if err != nil {
 		beego.Error(err)
 		return nil, err
@@ -69,7 +69,7 @@ func (s *RoleServ) GetRoleByID(roleid string) (*system.Role, error) {
 }
 
 // SaveRole 保存角色
-func (s *RoleServ) SaveRole(role model.SysRole, menuids string) (*model.SysRole, error) {
+func (s *RoleServ) SaveRole(role model.SysRole) (*model.SysRole, error) {
 	var newInfo *model.SysRole
 	var err error
 	if role.RoleId == "" {
@@ -82,17 +82,24 @@ func (s *RoleServ) SaveRole(role model.SysRole, menuids string) (*model.SysRole,
 		beego.Error(err)
 		return nil, err
 	}
-	err = s.dao.DelRoleMenu(newInfo.RoleId)
+
+	return newInfo, err
+}
+
+// SaveRoleMenu 保存角色菜单
+func (s *RoleServ) SaveRoleMenu(roleid, menuids string) error {
+	var err error
+	err = s.dao.DelRoleMenu(roleid)
 	if err != nil {
 		beego.Error(err)
-		return nil, err
+		return err
 	}
-	err = s.dao.SaveRoleMenu(newInfo.RoleId, menuids)
+	err = s.dao.SaveRoleMenu(roleid, menuids)
 	if err != nil {
 		beego.Error(err)
-		return nil, err
+		return err
 	}
-	return newInfo, err
+	return nil
 }
 
 // DelRole 删除角色

service/user.go

@@ -270,8 +270,23 @@ func (s *UserServ) GetUserTypes(caseids string) ([]model.TdUserType, error) {
 	return types, err
 }
 
+// GetUserRoles 获取用户角色
+func (s *UserServ) GetUserRoles(userid string) ([]model.SysRole, error) {
+	if userid == "" {
+		return nil, utils.LogError("没有对应的用户信息！")
+	}
+	userroles, err := s.dao.GetUserRole(userid)
+	return userroles, err
+}
+
 // SaveUserRole 保存用户对应角色
 func (s *UserServ) SaveUserRole(userid, roleids string) error {
+	if userid == "" {
+		return utils.LogError("没有对应的用户信息！")
+	}
+	if roleids == "" {
+		return utils.LogError("没有对应的角色信息！")
+	}
 	err := s.dao.DelUserRole(userid)
 	if err != nil {
 		return err