用户菜单修改

user_center/src/main/java/com/huaxu/service/MenuService.java

@@ -48,7 +48,7 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
 	public List<MenuEntity> findList(MenuEntity menuEntity) {
 		LoginUser currentUser = UserUtil.getCurrentUser();
 		Integer userId = currentUser.getId();
-		//-999租户管理员  1超级管理员  2普通用户
+		//-999租户管理员  -9999超级管理员  2普通用户
 		String userType = currentUser.getType();
 		menuEntity.setTenantId(currentUser.getTenantId());
 		List<MenuEntity> menuEntities = new ArrayList<>();
@@ -97,7 +97,7 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
 	public List<MenuEntity> findMenuByParentIds(List<Long> ids) {
 		LoginUser currentUser = UserUtil.getCurrentUser();
 		Integer userId = currentUser.getId();
-		//-999租户管理员  1超级管理员  2普通用户
+		//-999租户管理员  -9999超级管理员  2普通用户
 		String userType = currentUser.getType();
 		List<MenuEntity> menuEntities = new ArrayList<>();
 		switch (userType) {
@@ -120,7 +120,7 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
 	public boolean delMenuByIds(Long[] ids) {
 		LoginUser currentUser = UserUtil.getCurrentUser();
 		Integer userId = currentUser.getId();
-		//-999租户管理员  1超级管理员  2普通用户
+		//-999租户管理员  -9999超级管理员  2普通用户
 		String userType = currentUser.getType();
 		boolean isOk = false;
 		for(Long id : ids) {
@@ -145,7 +145,7 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
 	public boolean delMenuById(Long id) {
 		LoginUser currentUser = UserUtil.getCurrentUser();
 		Integer userId = currentUser.getId();
-		//-999租户管理员  1超级管理员  2普通用户
+		//-999租户管理员  -9999超级管理员  2普通用户
 		String userType = currentUser.getType();
 		boolean isOk = false;
 		switch (userType) {
@@ -180,10 +180,10 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
 	public boolean updateMenuById(MenuEntity menu) {
 		LoginUser currentUser = UserUtil.getCurrentUser();
 		Integer userId = currentUser.getId();
-         //-999租户管理员  1超级管理员  2普通用户
+         //-999租户管理员  -9999超级管理员  2普通用户
 		String userType = currentUser.getType();
 		TenantMenuEntity tenantMenuEntity = new TenantMenuEntity();
-		if(userType.equals("2")||userType.equals("-999")) {
+		if(!userType.equals("-9999")) {
 			MenuEntity menuEntity = menuMapper.findTenantByMenuId(currentUser.getTenantId(), menu.getId());
 			tenantMenuEntity.setId(menuEntity.getId());
 			tenantMenuEntity.setDateUpdate(new Date());
@@ -213,7 +213,7 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
 	public MenuEntity findMenuById(Long id) {
 		LoginUser currentUser = UserUtil.getCurrentUser();
 		Integer userId = currentUser.getId();
-		//-999租户管理员  1超级管理员  2普通用户
+		//-999租户管理员  -9999超级管理员  2普通用户
 		String userType = currentUser.getType();
 		MenuEntity menuEntity = new MenuEntity();
 		switch (userType) {
@@ -233,7 +233,7 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
 	public List<MenuEntity> findUserFirstMenu() {
 		LoginUser currentUser = UserUtil.getCurrentUser();
 		Integer userId = currentUser.getId();
-		//-999租户管理员  1超级管理员  2普通用户
+		//-999租户管理员  -9999超级管理员  2普通用户
 		String userType = currentUser.getType();
 		List<MenuEntity> menuEntities= new ArrayList<>();
 		switch (userType) {
@@ -260,7 +260,7 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
 	public List<MenuEntity> findUserMenu(String appId) {
 		LoginUser currentUser = UserUtil.getCurrentUser();
 		Integer userId = currentUser.getId();
-		//-999租户管理员  1超级管理员  2普通用户
+		//-999租户管理员  -9999超级管理员  2普通用户
 		String userType = currentUser.getType();
 		List<MenuEntity> menuEntities= new ArrayList<>();