diff --git a/src/main/java/com/keyware/htey/controller/humanResourceManagement/HumanResourceManagementController.java b/src/main/java/com/keyware/htey/controller/humanResourceManagement/HumanResourceManagementController.java index ed3fb1f..6cebcd7 100644 --- a/src/main/java/com/keyware/htey/controller/humanResourceManagement/HumanResourceManagementController.java +++ b/src/main/java/com/keyware/htey/controller/humanResourceManagement/HumanResourceManagementController.java @@ -27,7 +27,8 @@ public class HumanResourceManagementController { @Autowired private AuditLogService auditLogService; - @RequestMapping(value = {"/analysisExcl"},method = {RequestMethod.POST},produces = {"application/json; charset=utf-8"}) + @RequestMapping(value = {"/analysisExcl"}, method = {RequestMethod.POST}, + produces = {"application/json; charset=utf-8"}) @ResponseBody @Operation(summary = "用户列表导入", description = "返回导入信息") @ApiResponse(responseCode = "200", description = "成功导入信息") diff --git a/src/main/java/com/keyware/htey/controller/user/AuditLogController.java b/src/main/java/com/keyware/htey/controller/user/AuditLogController.java index 3d6563b..6758b32 100644 --- a/src/main/java/com/keyware/htey/controller/user/AuditLogController.java +++ b/src/main/java/com/keyware/htey/controller/user/AuditLogController.java @@ -8,11 +8,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; /** diff --git a/src/main/java/com/keyware/htey/mybatis/itf/UserMapper.java b/src/main/java/com/keyware/htey/mybatis/itf/UserMapper.java index da34115..4d24909 100644 --- a/src/main/java/com/keyware/htey/mybatis/itf/UserMapper.java +++ b/src/main/java/com/keyware/htey/mybatis/itf/UserMapper.java @@ -36,5 +36,6 @@ public interface UserMapper extends BaseMapper { int recovery(List var1); List selectLogOutUser(@Param("userName") String var1, @Param("projectSource") String var2); + int deleteByPrimaryKey(List var1); } diff --git a/src/main/java/com/keyware/htey/mybatis/itf/UserRoleMapper.java b/src/main/java/com/keyware/htey/mybatis/itf/UserRoleMapper.java index dd834e9..8319617 100644 --- a/src/main/java/com/keyware/htey/mybatis/itf/UserRoleMapper.java +++ b/src/main/java/com/keyware/htey/mybatis/itf/UserRoleMapper.java @@ -1,7 +1,6 @@ package com.keyware.htey.mybatis.itf; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.keyware.htey.entity.user.User; import com.keyware.htey.entity.user.UserRole; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/keyware/htey/mybatis/itf/UsersecretMapper.java b/src/main/java/com/keyware/htey/mybatis/itf/UsersecretMapper.java index 6a9ffd3..e1cf37d 100644 --- a/src/main/java/com/keyware/htey/mybatis/itf/UsersecretMapper.java +++ b/src/main/java/com/keyware/htey/mybatis/itf/UsersecretMapper.java @@ -14,5 +14,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface UsersecretMapper extends BaseMapper { int insertSelective(Usersecret var1); + void deleteByPrimaryKey(List var1); } diff --git a/src/main/java/com/keyware/htey/service/impl/DepartmentServiceImpl.java b/src/main/java/com/keyware/htey/service/impl/DepartmentServiceImpl.java index 81465f7..0211b01 100644 --- a/src/main/java/com/keyware/htey/service/impl/DepartmentServiceImpl.java +++ b/src/main/java/com/keyware/htey/service/impl/DepartmentServiceImpl.java @@ -26,6 +26,7 @@ public class DepartmentServiceImpl extends ServiceImpl getParentId(String parentId, String isSys, String projectRsource) { return this.departmentMapper.getParentId(parentId, isSys, projectRsource); diff --git a/src/main/java/com/keyware/htey/service/impl/UserServiceImpl.java b/src/main/java/com/keyware/htey/service/impl/UserServiceImpl.java index 84f86d6..3769d8d 100644 --- a/src/main/java/com/keyware/htey/service/impl/UserServiceImpl.java +++ b/src/main/java/com/keyware/htey/service/impl/UserServiceImpl.java @@ -20,6 +20,7 @@ public class UserServiceImpl extends ServiceImpl implements Us private static String projectName = "kdtr"; @Autowired private UserRoleMapper userRoleMapper; + @Override public List selectByUserInfo17suo(User user) { user.setProjectSource(projectName); @@ -73,14 +74,17 @@ public class UserServiceImpl extends ServiceImpl implements Us public int recovery(List record) { return this.userMapper.recovery(record); } + @Override public List selectLogOutUser(String userName) { return this.userMapper.selectLogOutUser(userName, Constant.projectName); } + @Override public int deleteByPrimaryKey(List id) { return this.userMapper.deleteByPrimaryKey(id); } + public void deleteUserRoleByUserId(String id) { this.userRoleMapper.deleteByUserId(id); } diff --git a/src/main/java/com/keyware/htey/service/impl/UsersecretServiceImpl.java b/src/main/java/com/keyware/htey/service/impl/UsersecretServiceImpl.java index e482edf..476f035 100644 --- a/src/main/java/com/keyware/htey/service/impl/UsersecretServiceImpl.java +++ b/src/main/java/com/keyware/htey/service/impl/UsersecretServiceImpl.java @@ -20,6 +20,7 @@ public class UsersecretServiceImpl extends ServiceImpl id) { this.usersecretMapper.deleteByPrimaryKey(id); diff --git a/src/main/java/com/keyware/htey/service/itf/DepartmentService.java b/src/main/java/com/keyware/htey/service/itf/DepartmentService.java index 388780b..c3f7d31 100644 --- a/src/main/java/com/keyware/htey/service/itf/DepartmentService.java +++ b/src/main/java/com/keyware/htey/service/itf/DepartmentService.java @@ -10,6 +10,5 @@ public interface DepartmentService extends IService { Department selectByPrimaryKey(String var1); - List getParentId(String var1, String var2, String var3); } diff --git a/src/main/java/com/keyware/htey/service/itf/UserService.java b/src/main/java/com/keyware/htey/service/itf/UserService.java index 95e196c..2b433cc 100644 --- a/src/main/java/com/keyware/htey/service/itf/UserService.java +++ b/src/main/java/com/keyware/htey/service/itf/UserService.java @@ -28,6 +28,8 @@ public interface UserService extends IService { int recovery(List var1); List selectLogOutUser(String var1); + int deleteByPrimaryKey(List var1); + void deleteUserRoleByUserId(String var1); } diff --git a/src/main/java/com/keyware/htey/service/itf/UsersecretService.java b/src/main/java/com/keyware/htey/service/itf/UsersecretService.java index 18e32d4..615e23b 100644 --- a/src/main/java/com/keyware/htey/service/itf/UsersecretService.java +++ b/src/main/java/com/keyware/htey/service/itf/UsersecretService.java @@ -7,5 +7,6 @@ import com.keyware.htey.entity.usersecret.Usersecret; public interface UsersecretService extends IService { int insertSelective(Usersecret var1); + void deleteByPrimaryKey(List var1); } diff --git a/src/main/java/com/keyware/htey/utli/IdComposeListUtil.java b/src/main/java/com/keyware/htey/utli/IdComposeListUtil.java index 9c8efb1..3baa45b 100644 --- a/src/main/java/com/keyware/htey/utli/IdComposeListUtil.java +++ b/src/main/java/com/keyware/htey/utli/IdComposeListUtil.java @@ -17,6 +17,7 @@ public class IdComposeListUtil { String userIds = stringId(userList); return Arrays.asList(userIds.split(",")); } + public static String stringId(List userList) { return userList.stream() .map(User::getId)