From 36a143b19cc919c9a814d065029b2340ef7330d7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 13 Jun 2022 14:56:25 +0800
Subject: [PATCH] 20220606
---
src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminWebSetController.java | 2 +-
src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeUserInfoVo.java | 3 +++
src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminNavigationBarController.java | 3 +--
src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java | 3 +--
src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminBelongController.java | 2 +-
src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminArticleController.java | 2 +-
src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminCommonController.java | 13 +------------
src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminRoleController.java | 5 +----
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java | 6 ++++++
src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminMenuController.java | 5 +----
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateUserDto.java | 3 +++
src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminUserController.java | 6 +-----
12 files changed, 21 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminArticleController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminArticleController.java
similarity index 97%
rename from src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminArticleController.java
rename to src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminArticleController.java
index 7f21c6a..a1b255e 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminArticleController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminArticleController.java
@@ -1,4 +1,4 @@
-package com.xcong.farmer.cms.modules.system.Controller;
+package com.xcong.farmer.cms.modules.system.controller;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.*;
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminBelongController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminBelongController.java
similarity index 97%
rename from src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminBelongController.java
rename to src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminBelongController.java
index 5175b89..0fc3f60 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminBelongController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminBelongController.java
@@ -1,4 +1,4 @@
-package com.xcong.farmer.cms.modules.system.Controller;
+package com.xcong.farmer.cms.modules.system.controller;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.*;
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminColumnController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java
similarity index 95%
rename from src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminColumnController.java
rename to src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java
index 90a073b..2e35522 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminColumnController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java
@@ -1,4 +1,4 @@
-package com.xcong.farmer.cms.modules.system.Controller;
+package com.xcong.farmer.cms.modules.system.controller;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.*;
@@ -9,7 +9,6 @@
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminCommonController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminCommonController.java
similarity index 90%
rename from src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminCommonController.java
rename to src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminCommonController.java
index 91c6b5f..8af07a6 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminCommonController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminCommonController.java
@@ -1,32 +1,21 @@
-package com.xcong.farmer.cms.modules.system.Controller;
+package com.xcong.farmer.cms.modules.system.controller;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.xcong.farmer.cms.common.contants.AppContants;
import com.xcong.farmer.cms.common.response.Result;
-import com.xcong.farmer.cms.configurations.properties.ApplicationProperties;
-import com.xcong.farmer.cms.modules.system.dto.AdminBase64UploadDto;
import com.xcong.farmer.cms.modules.system.dto.AdminLoginDto;
import com.xcong.farmer.cms.modules.system.service.ICommonService;
-import com.xcong.farmer.cms.utils.SpringContextHolder;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.util.FileCopyUtils;
-import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import sun.misc.BASE64Decoder;
import javax.annotation.Resource;
import java.io.File;
import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import cn.hutool.core.util.ObjectUtil;
-
@RestController
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminMenuController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminMenuController.java
similarity index 91%
rename from src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminMenuController.java
rename to src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminMenuController.java
index 070ed5e..b4282ac 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminMenuController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminMenuController.java
@@ -1,17 +1,14 @@
-package com.xcong.farmer.cms.modules.system.Controller;
+package com.xcong.farmer.cms.modules.system.controller;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.*;
import com.xcong.farmer.cms.modules.system.service.IMenuService;
-import com.xcong.farmer.cms.modules.system.service.IRoleService;
import com.xcong.farmer.cms.modules.system.vo.AdminMenuVo;
-import com.xcong.farmer.cms.modules.system.vo.AdminRoleVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminNavigationBarController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminNavigationBarController.java
similarity index 95%
rename from src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminNavigationBarController.java
rename to src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminNavigationBarController.java
index f1eeb0a..5cb8cd1 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminNavigationBarController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminNavigationBarController.java
@@ -1,4 +1,4 @@
-package com.xcong.farmer.cms.modules.system.Controller;
+package com.xcong.farmer.cms.modules.system.controller;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.*;
@@ -9,7 +9,6 @@
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminRoleController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminRoleController.java
similarity index 90%
rename from src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminRoleController.java
rename to src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminRoleController.java
index 62de727..0d26e6f 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminRoleController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminRoleController.java
@@ -1,17 +1,14 @@
-package com.xcong.farmer.cms.modules.system.Controller;
+package com.xcong.farmer.cms.modules.system.controller;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.*;
import com.xcong.farmer.cms.modules.system.service.IRoleService;
-import com.xcong.farmer.cms.modules.system.service.IUserService;
import com.xcong.farmer.cms.modules.system.vo.AdminRoleVo;
-import com.xcong.farmer.cms.modules.system.vo.AdminUserVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminUserController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminUserController.java
similarity index 91%
rename from src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminUserController.java
rename to src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminUserController.java
index 45cd6ac..5de7e88 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminUserController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminUserController.java
@@ -1,18 +1,14 @@
-package com.xcong.farmer.cms.modules.system.Controller;
+package com.xcong.farmer.cms.modules.system.controller;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.*;
import com.xcong.farmer.cms.modules.system.service.IUserService;
import com.xcong.farmer.cms.modules.system.vo.AdminUserVo;
-import com.xcong.farmer.cms.modules.test.dto.TestUserDto;
-import com.xcong.farmer.cms.modules.test.entity.TestUserEntity;
-import com.xcong.farmer.cms.modules.test.mapper.TestUserEntityMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminWebSetController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminWebSetController.java
similarity index 95%
rename from src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminWebSetController.java
rename to src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminWebSetController.java
index f2b2b70..22e733e 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminWebSetController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminWebSetController.java
@@ -1,4 +1,4 @@
-package com.xcong.farmer.cms.modules.system.Controller;
+package com.xcong.farmer.cms.modules.system.controller;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.AdminUpdateWebSetDto;
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateUserDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateUserDto.java
index 76aa163..2397e80 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateUserDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateUserDto.java
@@ -23,6 +23,9 @@
@ApiModelProperty(value = "邮箱")
private String email;
+ @ApiModelProperty(value = "所属公司ID")
+ private Long belongId;
+
@ApiModelProperty(value = "角色IDS")
private String roleIds;
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java
index 8e297cd..2341744 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java
@@ -175,6 +175,7 @@
adminSeeUserInfoVo.setNickname(userEntity.getNickname());
adminSeeUserInfoVo.setPhone(userEntity.getPhone());
adminSeeUserInfoVo.setEmail(userEntity.getEmail());
+ adminSeeUserInfoVo.setBelongId(userEntity.getBelongId());
List<AdminRoleVo> adminRoleVos = new ArrayList<>();
QueryWrapper<UserRoleEntity> objectQueryWrapper = new QueryWrapper<>();
@@ -208,10 +209,15 @@
if(StrUtil.isEmpty(phone)){
return Result.fail("请输入联系电话");
}
+ Long belongId = adminUpdateUserDto.getBelongId() == null ? UserEntity.USER_BELONG_TOP : adminUpdateUserDto.getBelongId();
+ if(UserEntity.USER_BELONG_TOP == belongId){
+ return Result.fail("请输入所属公司");
+ }
UserEntity userEntity = this.baseMapper.selectById(adminUpdateUserDto.getId());
if(ObjectUtil.isEmpty(userEntity)){
return Result.fail("用户不存在");
}
+ userEntity.setBelongId(belongId);
userEntity.setUsername(username);
userEntity.setPhone(phone);
if(StrUtil.isNotEmpty(adminUpdateUserDto.getNickname())){
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeUserInfoVo.java b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeUserInfoVo.java
index 0131392..4495baf 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeUserInfoVo.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeUserInfoVo.java
@@ -24,6 +24,9 @@
@ApiModelProperty(value = "邮箱")
private String email;
+ @ApiModelProperty(value = "所属公司ID")
+ private Long belongId;
+
@ApiModelProperty(value = "角色")
private List<AdminRoleVo> AdminRoleVos;
--
Gitblit v1.9.1