diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/repository/DictDetailRepository.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/repository/DictDetailRepository.java index dee68cb5..d013eacb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/repository/DictDetailRepository.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/repository/DictDetailRepository.java @@ -40,4 +40,11 @@ public interface DictDetailRepository extends JpaRepository, J * @return */ List findByLabelAndDict_Id(String label, Long dict_id); + + /** + * 根据label查数据 + * @param label + * @return + */ + List findByLabel(String label); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java index 935e83d6..15f5ab33 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java @@ -74,6 +74,8 @@ public class DictDetailServiceImpl implements DictDetailService { public void update(DictDetail resources) { DictDetail dictDetail = dictDetailRepository.findById(resources.getId()).orElseGet(DictDetail::new); ValidationUtil.isNull( dictDetail.getId(),"DictDetail","id",resources.getId()); + List label = dictDetailRepository.findByLabelAndDict_Id(resources.getLabel(), resources.getDict().getId()); + if (ObjectUtil.isNotEmpty(label)) throw new BadRequestException("字典[" + resources.getLabel() + "]已存在"); resources.setId(dictDetail.getId()); dictDetailRepository.save(resources); // 清理缓存 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DictServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DictServiceImpl.java index 4bf2a119..4ad6d052 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DictServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DictServiceImpl.java @@ -80,6 +80,8 @@ public class DictServiceImpl implements DictService { delCaches(resources); Dict dict = dictRepository.findById(resources.getId()).orElseGet(Dict::new); ValidationUtil.isNull( dict.getId(),"Dict","id",resources.getId()); + Dict dict1 = dictRepository.findByName(resources.getName()); + if (ObjectUtil.isNotEmpty(dict1)) throw new BadRequestException("字典[" + resources.getName() + "]已存在"); dict.setName(resources.getName()); dict.setDescription(resources.getDescription()); dictRepository.save(dict); diff --git a/mes/qd/src/views/system/dept/index.vue b/mes/qd/src/views/system/dept/index.vue index bbd738a8..321f3008 100644 --- a/mes/qd/src/views/system/dept/index.vue +++ b/mes/qd/src/views/system/dept/index.vue @@ -285,7 +285,7 @@ export default { }).then(() => { crudDept.edit(data).then(res => { this.crud.notify(this.dict.label.dept_status[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS) - // this.crud.toQuery() + this.crud.toQuery() }).catch(err => { data.enabled = !data.enabled console.log(err.response.data.message) diff --git a/mes/qd/src/views/system/user/index.vue b/mes/qd/src/views/system/user/index.vue index ba889ee1..1a7a2818 100644 --- a/mes/qd/src/views/system/user/index.vue +++ b/mes/qd/src/views/system/user/index.vue @@ -269,7 +269,7 @@ export default { return CRUD({ title: '用户', url: 'api/users', - sort: ['deptId', 'nickName', 'username'], + sort: ['deptId', 'username'], crudMethod: { ...crudUser } }) },