0822

controllers/channel/channel.go

@@ -34,7 +34,7 @@ func (c *ChannelController) GetChannelList() {
 
 // GetChannelById根据id获取渠道
 func (c *ChannelController) GetChannelById() {
-	caseid := c.GetString(":caseid")
+	caseid := c.GetString(":channelId")
 	channel, err := c.dao.GetChannelById(caseid)
 	if err != nil {
 		c.ResponseError(err)

controllers/customer/customer.go

@@ -27,8 +27,9 @@ func (c *CustomerController) Constructor() {
 func (c *CustomerController) CustWXList() {
 	phone := c.GetString("phone")
 	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
 
-	custList, total, err := c.serv.GetCustWithWXList(phone, page)
+	custList, total, err := c.serv.GetCustWithWXList(phone, page, pageSize)
 	if err != nil {
 		utils.LogError("获取客户列表失败: " + err.Error())
 		c.ResponseError(
@@ -38,8 +39,10 @@ func (c *CustomerController) CustWXList() {
 	}
 
 	c.ResponseJSON(map[string]interface{}{
-		"list":  custList,
-		"total": total,
+		"list":     custList,
+		"pagenum":  total,
+		"page":     page,
+		"pagesize": pageSize,
 	})
 }
 

controllers/system/role.go

@@ -45,6 +45,16 @@ func (c *RoleController) GetRoleByID() {
 	c.ResponseJSON(info)
 }
 
+// GetRoleMenuByRole 获取角色菜单
+func (c *RoleController) GetRoleMenuByRole() {
+	roleid := c.GetString(":roleid")
+	menus, err := c.dao.GetRoleMeneByID(roleid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(menus)
+}
+
 // SaveCaseRole 保存角色
 func (c *RoleController) SaveCaseRole() {
 	role := model.SysRole{}

models/channel/channel.go

@@ -53,7 +53,7 @@ func (m *ChannelDAO) GetChannels(caseid string, page int, pageSize int) ([]Chann
 // GetChannelById 根据渠道id获取渠道
 func (m *ChannelDAO) GetChannelById(channelId string) (*model.TaChannel, error) {
 	var channel []model.TaChannel
-	err := m.db.Where("channel_id = ", channelId).And("status > ?", models.STATUS_DEL).Find(&channel)
+	err := m.db.Where("channel_id = ?", channelId).And("status > ?", models.STATUS_DEL).Find(&channel)
 	if err != nil {
 		return nil, err
 	}

models/customer/customer.go

@@ -40,6 +40,9 @@ func (m *CustomerDAO) CustWithWXList(phone string, page ...int) ([]CustWithWX, i
 	if m.ctx.Get("pageNum") != nil {
 		pageNum = m.ctx.Get("pageNum").(int)
 	}
+	if len(page) > 1 {
+		pageNum = page[1]
+	}
 
 	pg := 1
 	if len(page) > 0 {

models/model/sys_menu.go

@@ -16,4 +16,5 @@ type SysMenu struct {
 	Status     int       `xorm:"SMALLINT(6)"`
 	CreateDate time.Time `xorm:"DATETIME"`
 	OrgId      string    `xorm:"VARCHAR(64)"`
+	FatherIds  string    `xorm:"TEXT"`
 }

models/system/role.go

@@ -60,8 +60,8 @@ type Role struct {
 }
 
 // GetRoleByID 根据ID获取角色
-func (m *RoleDAO) GetRoleByID(roleid string) (*Role, error) {
-	var roles []Role
+func (m *RoleDAO) GetRoleByID(roleid string) (*model.SysRole, error) {
+	var roles []model.SysRole
 	sql := `select * from sys_role where role_id='` + roleid + `' and status>` + strconv.Itoa(models.STATUS_DEL)
 	err := m.db.Sql(sql).Find(&roles)
 	if err != nil {
@@ -122,7 +122,25 @@ func (m *RoleDAO) DelRoleMenu(roleid string) error {
 
 // SaveRoleMenu 保存角色对应的菜单
 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)
+	sql := `insert into sys_role_menu(role_id,menu_id) select DISTINCT '` + roleid + `', a.menu_id from sys_menu a left join sys_menu b on find_in_set(b.menu_id,a.father_ids) where (b.menu_id in ('` + strings.Replace(menuids, ",", "','", -1) + `') or a.menu_id in ('` + strings.Replace(menuids, ",", "','", -1) + `')) and a.status> ` + strconv.Itoa(models.STATUS_DEL)
+	_, err := m.db.Exec(sql)
+	return err
+}
+
+// DelUserMenusByRole 批量删除处理用户对应菜单信息
+func (m *RoleDAO) DelUserMenusByRole(roleid string) error {
+	sql := "delete a from sys_user_menu a inner join sys_user_role b on a.user_id=b.user_id where b.role_id='" + roleid + "'"
+	_, err := m.db.Exec(sql)
+	return err
+}
+
+// SaveUserMenusByRole 批量保存用户对应菜单信息
+func (m *RoleDAO) SaveUserMenus(roleid string) error {
+	sql := `insert into sys_user_menu (user_id,menu_id)
+	select DISTINCT c.user_id,a.menu_id from sys_menu a 
+	inner join sys_role_menu b on a.menu_id = b.menu_id
+	inner join sys_user_role c on b.role_id = c.role_id
+	where c.user_id in (select user_id from sys_user_role where role_id='` + roleid + `')`
 	_, err := m.db.Exec(sql)
 	return err
 }

models/system/user.go

@@ -213,6 +213,13 @@ func (m *UserDAO) SaveUserRole(userid, roleids string) error {
 	return err
 }
 
+// GetUserByRole 根据角色获取用户信息
+func (m *UserDAO) GetUserByRole(roleid string) ([]model.SysUserRole, error) {
+	var userroles []model.SysUserRole
+	err := m.db.Where("role_id=?", roleid).Find(&userroles)
+	return userroles, err
+}
+
 // DelUserMenu 删除用户对应的菜单信息
 func (m *UserDAO) DelUserMenu(userid string) error {
 	sql := "delete from sys_user_menu where user_id='" + userid + "'"
@@ -284,7 +291,7 @@ func (m *UserDAO) ValidatePassword(user *model.SysUser, password string) bool {
 func (m *UserDAO) UpdatePassword(userID, newPass string) error {
 	password := encrypt.Md5(newPass, userID)
 
-	sql := "update sys_user set passwd=? where user_id=?"
+	sql := "update sys_user set pwd=? where user_id=?"
 
 	_, err := m.db.Exec(sql, password, userID)
 	if err != nil {

routers/common.go

@@ -148,6 +148,7 @@ 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{}, "get:GetRoleMenuByRole"),
 		beego.NSRouter("/rolemenu/:roleid", &system.RoleController{}, "put:SaveRoleMenus"),
 
 		// course 课程

service/system/role.go

@@ -51,23 +51,33 @@ func (s *RoleServ) GetRoleList(caseids, name, caseid string, page, pageSize int)
 }
 
 // GetRoleByID 根据ID获取角色
-func (s *RoleServ) GetRoleByID(roleid string) (*system.Role, error) {
+func (s *RoleServ) GetRoleByID(roleid string) (*model.SysRole, error) {
 	role, err := s.dao.GetRoleByID(roleid)
 	if err != nil {
 		beego.Error(err)
 		return nil, err
 	}
-	if role != nil {
-		menus, err := s.dao.GetRoleMenuByRoleID(roleid)
-		if err != nil {
-			beego.Error(err)
-			return nil, err
-		}
-		role.RoleMenu = menus
-	}
+	// if role != nil {
+	// 	menus, err := s.dao.GetRoleMenuByRoleID(roleid)
+	// 	if err != nil {
+	// 		beego.Error(err)
+	// 		return nil, err
+	// 	}
+	// 	role.RoleMenu = menus
+	// }
 	return role, err
 }
 
+// GetRoleMeneByID 根据ID获取角色菜单
+func (s *RoleServ) GetRoleMeneByID(roleid string) ([]model.SysMenu, error) {
+	menus, err := s.dao.GetRoleMenuByRoleID(roleid)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+	return menus, nil
+}
+
 // SaveRole 保存角色
 func (s *RoleServ) SaveRole(role model.SysRole) (*model.SysRole, error) {
 	var newInfo *model.SysRole
@@ -99,7 +109,13 @@ func (s *RoleServ) SaveRoleMenu(roleid, menuids string) error {
 		beego.Error(err)
 		return err
 	}
-	return nil
+	err = s.dao.DelUserMenusByRole(roleid)
+	if err != nil {
+		beego.Error(err)
+		return err
+	}
+	err = s.dao.SaveUserMenus(roleid)
+	return err
 }
 
 // DelRole 删除角色