|
@@ -134,7 +134,7 @@ public class SysDepartController {
|
|
@RequestMapping(value = "/edit", method = RequestMethod.PUT)
|
|
@RequestMapping(value = "/edit", method = RequestMethod.PUT)
|
|
@CacheEvict(value = {CacheConstant.SYS_DEPARTS_CACHE, CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries = true)
|
|
@CacheEvict(value = {CacheConstant.SYS_DEPARTS_CACHE, CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries = true)
|
|
public Result<SysDepart> edit(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
|
|
public Result<SysDepart> edit(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
|
|
- sysBaseAPI.addLog("编辑部门,id: " + sysDepart.getId(), 0, 2);
|
|
|
|
|
|
+ sysBaseAPI.addLog("编辑部门,id: " + sysDepart.getId(), CommonConstant.LOG_TYPE_2, 2);
|
|
String username = JwtUtil.getUserNameByToken(request);
|
|
String username = JwtUtil.getUserNameByToken(request);
|
|
sysDepart.setUpdateBy(username);
|
|
sysDepart.setUpdateBy(username);
|
|
Result<SysDepart> result = new Result<SysDepart>();
|
|
Result<SysDepart> result = new Result<SysDepart>();
|
|
@@ -161,7 +161,7 @@ public class SysDepartController {
|
|
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
|
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
|
@CacheEvict(value = {CacheConstant.SYS_DEPARTS_CACHE, CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries = true)
|
|
@CacheEvict(value = {CacheConstant.SYS_DEPARTS_CACHE, CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries = true)
|
|
public Result<SysDepart> delete(@RequestParam(name = "id", required = true) String id) {
|
|
public Result<SysDepart> delete(@RequestParam(name = "id", required = true) String id) {
|
|
- sysBaseAPI.addLog("删除部门,id: " + id, 0, 3);
|
|
|
|
|
|
+ sysBaseAPI.addLog("删除部门,id: " + id, CommonConstant.LOG_TYPE_2, 3);
|
|
Result<SysDepart> result = new Result<SysDepart>();
|
|
Result<SysDepart> result = new Result<SysDepart>();
|
|
SysDepart sysDepart = sysDepartService.getById(id);
|
|
SysDepart sysDepart = sysDepartService.getById(id);
|
|
if (sysDepart == null) {
|
|
if (sysDepart == null) {
|
|
@@ -186,7 +186,7 @@ public class SysDepartController {
|
|
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
|
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
|
@CacheEvict(value = {CacheConstant.SYS_DEPARTS_CACHE, CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries = true)
|
|
@CacheEvict(value = {CacheConstant.SYS_DEPARTS_CACHE, CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries = true)
|
|
public Result<SysDepart> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
|
public Result<SysDepart> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
|
- sysBaseAPI.addLog("批量删除部门, ids: " + ids, 0, 3);
|
|
|
|
|
|
+ sysBaseAPI.addLog("批量删除部门, ids: " + ids, CommonConstant.LOG_TYPE_2, 3);
|
|
Result<SysDepart> result = new Result<SysDepart>();
|
|
Result<SysDepart> result = new Result<SysDepart>();
|
|
if (ids == null || "".equals(ids.trim())) {
|
|
if (ids == null || "".equals(ids.trim())) {
|
|
result.error500("参数不识别!");
|
|
result.error500("参数不识别!");
|