diff --git a/cds-fontend-2025.V1/src/views/mps/emp-add-items/modules/emp-add-items-import-modal.vue b/cds-fontend-2025.V1/src/views/mps/emp-add-items/modules/emp-add-items-import-modal.vue
index d9a6b7b..ef8f871 100644
--- a/cds-fontend-2025.V1/src/views/mps/emp-add-items/modules/emp-add-items-import-modal.vue
+++ b/cds-fontend-2025.V1/src/views/mps/emp-add-items/modules/emp-add-items-import-modal.vue
@@ -180,7 +180,7 @@
-
+ {{ $t('common.downloadTemplate') }}
{{ $t('common.import') }}
diff --git a/cds-fontend-2025.V1/src/views/original/import-special/modules/import-special-search.vue b/cds-fontend-2025.V1/src/views/original/import-special/modules/import-special-search.vue
index d47f0c2..5d79319 100644
--- a/cds-fontend-2025.V1/src/views/original/import-special/modules/import-special-search.vue
+++ b/cds-fontend-2025.V1/src/views/original/import-special/modules/import-special-search.vue
@@ -50,51 +50,51 @@ async function search() {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cds-fontend-2025.V1/src/views/original/traffic/modules/traffic-search.vue b/cds-fontend-2025.V1/src/views/original/traffic/modules/traffic-search.vue
index 8aeacbf..6b7f455 100644
--- a/cds-fontend-2025.V1/src/views/original/traffic/modules/traffic-search.vue
+++ b/cds-fontend-2025.V1/src/views/original/traffic/modules/traffic-search.vue
@@ -47,9 +47,9 @@ async function search() {
-
-
-
+
+
+
diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsEmpAddItemsServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsEmpAddItemsServiceImpl.java
index 6fbb493..f44833f 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsEmpAddItemsServiceImpl.java
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsEmpAddItemsServiceImpl.java
@@ -148,8 +148,8 @@ public class MpsEmpAddItemsServiceImpl implements IMpsEmpAddItemsService {
*/
@Override
public Boolean insertByBo(MpsEmpAddItemsBo bo) {
- String month = DateUtils.parseDateToStr(FormatsType.YYYY_MM,Date.from(Instant.ofEpochMilli(Long.parseLong(bo.getRecordMonth()))));
- bo.setRecordMonth(month);
+// String month = DateUtils.parseDateToStr(FormatsType.YYYY_MM,Date.from(Instant.ofEpochMilli(Long.parseLong(bo.getRecordMonth()))));
+ bo.setRecordMonth(bo.getRecordMonth());
MpsEmpAddItems add = MapstructUtils.convert(bo, MpsEmpAddItems.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java
index ed0b6ce..2279783 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java
@@ -191,6 +191,10 @@ public class MpsMarketServiceImpl implements IMpsMarketService {
public Boolean insertByBo(MpsMarketBo bo) {
MpsMarket add = MapstructUtils.convert(bo, MpsMarket.class);
add.setEntryDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
+
+ //身份证非空，x改大写
+ add.setCustId(add.getCustId() != null ? add.getCustId().toUpperCase() : null);
+
validEntityBefore(add);
System.out.println("add:--->"+add);
boolean flag = baseMapper.insert(add) > 0;
diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/resources/mapper/mps/MpsDetailEntryMapper.xml b/cds-platform-2025.V1/cds-modules/cds-system/src/main/resources/mapper/mps/MpsDetailEntryMapper.xml
index bc78bf0..2499d6c 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/resources/mapper/mps/MpsDetailEntryMapper.xml
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/resources/mapper/mps/MpsDetailEntryMapper.xml
@@ -58,9 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM mps_market m
LEFT JOIN mps_traffic t ON m.traffic_id = t.traffic_id
LEFT JOIN mps_magneticcard c ON m.magnetic_card_id = c.magnetic_card_id
- LEFT JOIN sys_user s ON m.yx_id = s.mkt_no
- LEFT JOIN sys_dept d ON s.dept_id = d.dept_id
- LEFT JOIN sys_dept de ON m.dept_id = de.dept_id
+ LEFT JOIN sys_user s ON m.yx_id = s.mkt_no and s.del_flag='0'
+ LEFT JOIN sys_dept d ON s.dept_id = d.dept_id and d.del_flag='0'
+ LEFT JOIN sys_dept de ON m.dept_id = de.dept_id and de.del_flag='0'
where m.del_flag='0'
) temp ${ew.customSqlSegment}