From 91bdd84d06baa9aa075583bd3bafaf02f22df70f Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Fri, 5 Jan 2024 09:39:51 +0800
Subject: [PATCH] =?UTF-8?q?2024-1-5=20=E5=AD=97=E5=85=B8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/controller/DictTypeController.java     | 10 ++++++++++
 src/main/resources/mapper/project/ProjectDao.xml       |  1 +
 2 files changed, 11 insertions(+)

diff --git a/src/main/java/com/spring/modules/sys/controller/DictTypeController.java b/src/main/java/com/spring/modules/sys/controller/DictTypeController.java
index 06b6df48..00056c61 100644
--- a/src/main/java/com/spring/modules/sys/controller/DictTypeController.java
+++ b/src/main/java/com/spring/modules/sys/controller/DictTypeController.java
@@ -32,6 +32,16 @@ public class DictTypeController {
         if (Objects.isNull(dictType)){
             throw new RuntimeException("字典编码为空");
         }
+        if (!StringUtils.hasText(dictType.getDictType())){
+            throw new RuntimeException("字典类型为空");
+        }
+        if (!StringUtils.hasText(dictType.getSite())){
+            throw new RuntimeException("工厂编码为空");
+        }
+        List<DictType> list = dictTypeService.list(new LambdaQueryWrapper<DictType>().eq(DictType::getDictType, dictType.getDictType()).eq(DictType::getSite, dictType.getSite()));
+        if (null != list && !list.isEmpty()){
+            throw new RuntimeException("该字典类型已存在!");
+        }
         if (dictTypeService.save(dictType)) {
             return R.ok("保存成功!");
         }
diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml
index 611a3d41..a0cd655c 100644
--- a/src/main/resources/mapper/project/ProjectDao.xml
+++ b/src/main/resources/mapper/project/ProjectDao.xml
@@ -32,6 +32,7 @@
                 AND bu_no in ( select bu_no from AccessBu where site=#{query.site} and username=#{query.userName}  )
             </if>
         </where>
+    order by create_date desc
 </select>
 <select id="checkPlmProjectInfoData" resultType="PlmProjectInfoData">
       SELECT project_id,ori_project_id,project_level,project_type_db,project_name,status,project_source,customer_id,create_by,