diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java
index 4b2b6202..0eb282fd 100644
--- a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java
+++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java
@@ -1,11 +1,13 @@
 package com.hxkj.admin.controller.setting;
 
+import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.hxkj.admin.service.setting.ISettingDictDataService;
 import com.hxkj.admin.validate.common.PageParam;
 import com.hxkj.admin.validate.setting.DictDataParam;
 import com.hxkj.admin.vo.setting.DictDataVo;
 import com.hxkj.common.core.AjaxResult;
 import com.hxkj.common.core.PageResult;
+import com.hxkj.common.utils.StringUtil;
 import com.hxkj.common.validator.annotation.IDMust;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -31,7 +33,8 @@ public class DictDataController {
      * @return Object
      */
     @GetMapping("/all")
-    public Object all(Map<String, String> params) {
+    public Object all(@RequestParam Map<String, String> params) {
+        Assert.isFalse(StringUtil.isEmpty(params.get("dictType")), "dictType缺失");
         List<DictDataVo> list = iSettingDictDataService.all(params);
         return AjaxResult.success(list);
     }
@@ -47,6 +50,7 @@ public class DictDataController {
     @GetMapping("/list")
     public Object list(@Validated PageParam pageParam,
                        @RequestParam Map<String, String> params) {
+        Assert.isFalse(StringUtil.isEmpty(params.get("dictType")), "dictType缺失");
         PageResult<DictDataVo> list = iSettingDictDataService.list(pageParam, params);
         return AjaxResult.success(list);
     }
diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java
index 2b3f6101..71cc3ad1 100644
--- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java
+++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java
@@ -10,7 +10,9 @@ import com.hxkj.admin.validate.setting.DictDataParam;
 import com.hxkj.admin.vo.setting.DictDataVo;
 import com.hxkj.common.core.PageResult;
 import com.hxkj.common.entity.setting.DictData;
+import com.hxkj.common.entity.setting.DictType;
 import com.hxkj.common.mapper.setting.DictDataMapper;
+import com.hxkj.common.mapper.setting.DictTypeMapper;
 import com.hxkj.common.utils.TimeUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -29,6 +31,9 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService {
     @Resource
     DictDataMapper dictDataMapper;
 
+    @Resource
+    DictTypeMapper dictTypeMapper;
+
     /**
      * 字典数据所有
      *
@@ -37,18 +42,27 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService {
      */
     @Override
     public List<DictDataVo> all(Map<String, String> params) {
+        DictType dictType = dictTypeMapper.selectOne(new QueryWrapper<DictType>()
+                .eq("dict_type", params.get("dictType"))
+                .eq("is_delete", 0)
+                .last("limit 1"));
+
+        Assert.notNull(dictType, "该字典类型不存在!");
+
         QueryWrapper<DictData> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("id,type_id,name,value,remark,sort,status,create_time,update_time");
         queryWrapper.eq("is_delete", 0);
+        queryWrapper.eq("type_id", dictType.getId());
         queryWrapper.orderByDesc("id");
 
-        List<DictData> dictDataList = dictDataMapper.selectList(queryWrapper);
-
         dictDataMapper.setSearch(queryWrapper, params, new String[]{
-                "like:key:str",
+                "like:name:str",
+                "like:value:str",
                 "=:status:int",
         });
 
+        List<DictData> dictDataList = dictDataMapper.selectList(queryWrapper);
+
         List<DictDataVo> list = new LinkedList<>();
         for (DictData dictData : dictDataList) {
             DictDataVo vo = new DictDataVo();
@@ -75,13 +89,22 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService {
         Integer page  = pageParam.getPageNo();
         Integer limit = pageParam.getPageSize();
 
+        DictType dictType = dictTypeMapper.selectOne(new QueryWrapper<DictType>()
+                .eq("is_delete", 0)
+                .eq("dict_type", params.get("dictType"))
+                .last("limit 1"));
+
+        Assert.notNull(dictType, "该字典类型不存在!");
+
         QueryWrapper<DictData> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("id,type_id,name,value,remark,sort,status,create_time,update_time");
+        queryWrapper.eq("type_id", dictType.getId());
         queryWrapper.eq("is_delete", 0);
         queryWrapper.orderByDesc("id");
 
         dictDataMapper.setSearch(queryWrapper, params, new String[]{
-                "like:key:str",
+                "like:name:str",
+                "like:value:str",
                 "=:status:int",
         });
 
diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthAdminServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthAdminServiceImpl.java
index 75777ac6..89d89c3a 100644
--- a/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthAdminServiceImpl.java
+++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthAdminServiceImpl.java
@@ -328,16 +328,16 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
 
         Assert.notNull(model, "账号不存在了!");
 
-        String currPassword = ToolsUtil.makeMd5(systemAuthAdminParam.getCurrPassword() + model.getSalt());
-        if (!currPassword.equals(model.getPassword())) {
-            throw new OperateException("当前密码不正确!");
-        }
-
         model.setNickname(systemAuthAdminParam.getNickname());
         model.setAvatar( UrlUtil.toRelativeUrl(systemAuthAdminParam.getAvatar()));
         model.setUpdateTime(System.currentTimeMillis() / 1000);
 
         if (systemAuthAdminParam.getPassword() != null && !systemAuthAdminParam.getPassword().equals("")) {
+            String currPassword = ToolsUtil.makeMd5(systemAuthAdminParam.getCurrPassword() + model.getSalt());
+            if (!currPassword.equals(model.getPassword())) {
+                throw new OperateException("当前密码不正确!");
+            }
+
             String salt   = ToolsUtil.randomString(5);
             String pwd    = ToolsUtil.makeMd5( systemAuthAdminParam.getPassword().trim() + salt);
             model.setPassword(pwd);