diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAdminService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAdminService.java index ebdc0ad4..5002bea6 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAdminService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAdminService.java @@ -163,7 +163,7 @@ public interface ISystemAdminService { systemDeptMapper.setSearch(queryWrapper, params, new String[]{ "like:name:str", - "=:isStop:int" + "=:isStop@is_stop:int" }); List systemDeptList = systemDeptMapper.selectList(queryWrapper); @@ -297,7 +297,7 @@ public interface ISystemAdminService { .eq("is_delete", 0) .last("limit 1")); - Assert.isNull(systemAdmin, "该部门已被“"+systemAdmin.getNickname()+"”管理员使用,请先移除"); + Assert.isNull(systemAdmin, "该部门已被管理员使用,请先移除"); model.setIsDelete(1); model.setDeleteTime(System.currentTimeMillis() / 1000); diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemPostService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemPostService.java index 9d8d8110..87b6eaa1 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemPostService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemPostService.java @@ -80,7 +80,7 @@ public class SystemPostService implements ISystemPostService { systemPostMapper.setSearch(queryWrapper, params, new String[]{ "like:code:str", "like:name:str", - "=:isStop:int" + "=:isStop@is_stop:int" }); IPage iPage = systemPostMapper.selectPage(new Page<>(page, limit), queryWrapper); @@ -215,7 +215,7 @@ public class SystemPostService implements ISystemPostService { .eq("is_delete", 0) .last("limit 1")); - Assert.isNull(systemAdmin, "该岗位已被“"+systemAdmin.getNickname()+"”管理员使用,请先移除"); + Assert.isNull(systemAdmin, "该岗位已被管理员使用,请先移除"); model.setIsDelete(1); model.setDeleteTime(System.currentTimeMillis() / 1000);