diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java index c5440fd..cb52513 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java @@ -28,7 +28,7 @@ public class UserController { return userService.login(loginRequest); } -// @RequiredRole(AdminTypeEnum.SYSTEM) + @RequiredRole(AdminTypeEnum.SYSTEM) @PostMapping("/createUser") @UserOperation(value = "新增用户信息", modelName = UserOperationModuleEnum.USER) public ElectromagneticResult createUser(@RequestBody UserRequest userRequest) { diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserMapper.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserMapper.java index 3497a0b..f0afc3c 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserMapper.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserMapper.java @@ -12,31 +12,6 @@ import java.util.List; @Mapper public interface UserMapper extends BaseMapper { -// /** -// * 插入 -// * -// * @param user -// * @return -// */ -// @Override -// int insert(User user); -// -// /** -// * 编辑 -// * -// * @param user -// * @return -// */ -// int modify(User user); - -// /** -// * 发布 -// * -// * @param publishParam -// * @return -// */ -// int publish(PublishParam publishParam); - /** * 通过工号查询用户 * @@ -69,14 +44,6 @@ public interface UserMapper extends BaseMapper { */ int getTotalCount(SearchKeyWords searchKeywords); -// /** -// * 通过用户ID删除用户 -// * -// * @param userDeleteKeyWords -// * @return -// */ -// int deleteUser(UserDeleteKeyWords userDeleteKeyWords); - /** * 查找用户角色名称 * diff --git a/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml b/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml index c480370..3048642 100644 --- a/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml +++ b/electrmangnetic/src/main/resources/sqlmapper/UserMapper.xml @@ -17,12 +17,10 @@ - - - - - - + + + + @@ -50,84 +48,6 @@ from ed_users - - insert into ed_users( - id, - user_name, - work_number, - mobile, - user_dept, - user_title, - user_account, - user_pwd, - join_time, - is_published, - is_activated, - salt, - user_status, - internship_end_date, - creator, - creator_name, - gmt_create, - effect_flag) - values ( - #{id}, - #{userName}, - #{workNumber}, - #{mobile}, - #{userDept}, - #{userTitle}, - #{userAccount}, - #{userPwd}, - #{joinTime}, - #{isPublished}, - #{isActivated}, - #{salt}, - #{userStatus}, - #{internshipEndDate}, - #{creator}, - #{creatorName}, - now(), - 1 - ) - - - update ed_users - - id = #{id}, - user_name = #{userName}, - work_number = #{workNumber}, - mobile = #{mobile}, - user_dept = #{userDept}, - user_title = #{userTitle}, - user_account = #{userAccount}, - join_time = #{joinTime}, - user_status = #{userStatus}, - is_activated = #{isActivated}, - user_pwd = #{userPwd}, - internship_end_date = #{internshipEndDate}, - modifier = #{modifier}, - modifier_name = #{modifierName}, - gmt_modified=now() - - where id= #{userId} - - - - - update ed_users - - is_published = 1, - modifier = #{modifier}, - modifier_name = #{modifierName}, - gmt_modified = now() - - where id IN - - #{userId} - - - - - update ed_users - - effect_flag=0, - modifier=#{modifier}, - modifier_name=#{modifierName}, - gmt_modified = now() - - where id = #{userId} - -