irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix

Browse Source
This commit is contained in:
hucs
2024-06-24 17:24:25 +08:00
parent f689fc6bc9
commit 92202fccf7
4 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelAdminInfoController.java
View File

@@ -121,7 +121,7 @@ public class PlayPersonnelAdminInfoController {
@Log(title = "管理员管理", businessType = BusinessType.DELETE) @Log(title = "管理员管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public R remove(@PathVariable String[] ids) { public R remove(@PathVariable String[] ids) {
Long ruleId = sysRoleService.selectByRoleKey("leader").getRoleId(); Long ruleId = sysRoleService.selectByRoleKey("operator").getRoleId();
for (String id : ids) { for (String id : ids) {
// 判断数据是否存在 // 判断数据是否存在
PlayPersonnelAdminInfoEntity entity = playPersonnelAdminInfoService.selectPlayPersonnelAdminInfoById(id); PlayPersonnelAdminInfoEntity entity = playPersonnelAdminInfoService.selectPlayPersonnelAdminInfoById(id);

2
play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelWaiterInfoController.java
View File

@@ -114,7 +114,7 @@ public class PlayPersonnelWaiterInfoController {
@Log(title = "客服信息", businessType = BusinessType.DELETE) @Log(title = "客服信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public R remove(@PathVariable String[] ids) { public R remove(@PathVariable String[] ids) {
Long ruleId = sysRoleService.selectByRoleKey("leader").getRoleId(); Long ruleId = sysRoleService.selectByRoleKey("operator").getRoleId();
for (String id : ids) { for (String id : ids) {
// 判断数据是否存在 // 判断数据是否存在
PlayPersonnelWaiterInfoEntity entity = playClerkWaiterInfoService.selectPlayClerkWaiterInfoById(id); PlayPersonnelWaiterInfoEntity entity = playClerkWaiterInfoService.selectPlayClerkWaiterInfoById(id);

8
play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java
View File

@@ -334,11 +334,11 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
waiter.setTenantId(sysTenantEntity.getTenantId()); waiter.setTenantId(sysTenantEntity.getTenantId());
roleMapper.insert(waiter); roleMapper.insert(waiter);
List<Long> waiterMenuIdList = Arrays.asList(1100L, 1101L, 1103L, 1104L, 1105L); List<Integer> waiterMenuIdList = Arrays.asList(102, 1100, 1101, 1103, 1104, 1105);
List<SysRoleMenuEntity> waiterMenuList = waiterMenuIdList.stream().map(menu -> { List<SysRoleMenuEntity> waiterMenuList = waiterMenuIdList.stream().map(menu -> {
SysRoleMenuEntity rm = new SysRoleMenuEntity(); SysRoleMenuEntity rm = new SysRoleMenuEntity();
rm.setRoleId(waiter.getRoleId()); rm.setRoleId(waiter.getRoleId());
rm.setMenuId(menu); rm.setMenuId(Long.valueOf(menu));
return rm; return rm;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
roleMenuService.saveBatch(waiterMenuList); roleMenuService.saveBatch(waiterMenuList);
@@ -353,11 +353,11 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
leader.setTenantId(sysTenantEntity.getTenantId()); leader.setTenantId(sysTenantEntity.getTenantId());
roleMapper.insert(leader); roleMapper.insert(leader);
List<Long> leaderMenuIdList = Arrays.asList(1000L, 10001L, 2087L, 1100L, 1101L, 2094L); List<Integer> leaderMenuIdList = Arrays.asList(101, 102, 1000, 2095, 2096, 2097, 2087, 1001, 1100, 1101, 105, 2094);
List<SysRoleMenuEntity> leaderMenuList = leaderMenuIdList.stream().map(menu -> { List<SysRoleMenuEntity> leaderMenuList = leaderMenuIdList.stream().map(menu -> {
SysRoleMenuEntity rm = new SysRoleMenuEntity(); SysRoleMenuEntity rm = new SysRoleMenuEntity();
rm.setRoleId(leader.getRoleId()); rm.setRoleId(leader.getRoleId());
rm.setMenuId(menu); rm.setMenuId(Long.valueOf(menu));
return rm; return rm;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
roleMenuService.saveBatch(leaderMenuList); roleMenuService.saveBatch(leaderMenuList);

42
play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkTypeController.java Normal file
View File

@@ -0,0 +1,42 @@
package com.starry.admin.modules.weichat.controller;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.starry.admin.modules.clerk.module.entity.PlayClerkTypeInfoEntity;
import com.starry.admin.modules.clerk.service.IPlayClerkTypeInfoService;
import com.starry.common.result.R;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
* 店员等级
*
* @author admin
* @since 2024/5/29 上午6:24
**/
@Slf4j
@RestController
@RequestMapping("/wx/clerk/type")
public class WxClerkTypeController {
@Resource
private IPlayClerkTypeInfoService clerkTypeInfoService;
/**
* 顾客查询所有店员所有等级列表
*
* @return 店员所有等级列表
*/
@GetMapping("/list")
public R clerkTypeList() {
List<PlayClerkTypeInfoEntity> list = clerkTypeInfoService.list(Wrappers.lambdaQuery(PlayClerkTypeInfoEntity.class).eq(PlayClerkTypeInfoEntity::getHomeDisplayed,1).orderByDesc(PlayClerkTypeInfoEntity::getSort));
return R.ok(list);
}
}