From f95c2cc9d70420202c07d469b49303e7b3b0d094 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期五, 17 五月 2024 10:03:05 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang

---
 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectDataServiceImpl.java |   41 +++++++++++++++++++----------------------
 1 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectDataServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectDataServiceImpl.java
index 732af07..e5a66b5 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectDataServiceImpl.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectDataServiceImpl.java
@@ -1,6 +1,7 @@
 package com.javaweb.geo.service.impl;
 
 import java.util.List;
+
 import com.javaweb.common.utils.DateUtils;
 import com.javaweb.common.utils.IdGenerate;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,50 +14,49 @@
 
 /**
  * 椤圭洰璧勬枡Service涓氬姟灞傚鐞�
- * 
+ *
  * @author cxy
  * @date 2024-05-16
  */
 @Service
-public class ProjectDataServiceImpl implements IProjectDataService 
-{
+public class ProjectDataServiceImpl implements IProjectDataService {
     @Autowired
     private ProjectDataMapper projectDataMapper;
 
     /**
      * 鏌ヨ椤圭洰璧勬枡
-     * 
+     *
      * @param id 椤圭洰璧勬枡ID
      * @return 椤圭洰璧勬枡
      */
     @Override
-    public ProjectData selectProjectDataById(String id)
-    {
+    public ProjectData selectProjectDataById(String id) {
         return projectDataMapper.selectProjectDataById(id);
     }
 
     /**
      * 鏌ヨ椤圭洰璧勬枡鍒楄〃
-     * 
+     *
      * @param projectData 椤圭洰璧勬枡
      * @return 椤圭洰璧勬枡
      */
     @Override
-    public List<ProjectData> selectProjectDataList(ProjectData projectData)
-    {
+    public List<ProjectData> selectProjectDataList(ProjectData projectData) {
+        if (!ObjectUtils.isEmpty(projectData.getDataType()) && projectData.getDataType().endsWith(",")){
+            projectData.setDataType(projectData.getDataType().substring(0,1));
+        }
         return projectDataMapper.selectProjectDataList(projectData);
     }
 
     /**
      * 鏂板椤圭洰璧勬枡
-     * 
+     *
      * @param projectData 椤圭洰璧勬枡
      * @return 缁撴灉
      */
     @Override
-    public int insertProjectData(ProjectData projectData)
-    {
-        if(ObjectUtils.isEmpty(projectData.getId())){
+    public int insertProjectData(ProjectData projectData) {
+        if (ObjectUtils.isEmpty(projectData.getId())) {
             projectData.setId(IdGenerate.nextId());
         }
         projectData.setCreateTime(DateUtils.getNowDate());
@@ -65,38 +65,35 @@
 
     /**
      * 淇敼椤圭洰璧勬枡
-     * 
+     *
      * @param projectData 椤圭洰璧勬枡
      * @return 缁撴灉
      */
     @Override
-    public int updateProjectData(ProjectData projectData)
-    {
+    public int updateProjectData(ProjectData projectData) {
         projectData.setUpdateTime(DateUtils.getNowDate());
         return projectDataMapper.updateProjectData(projectData);
     }
 
     /**
      * 鍒犻櫎椤圭洰璧勬枡瀵硅薄
-     * 
+     *
      * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
      * @return 缁撴灉
      */
     @Override
-    public int deleteProjectDataByIds(String ids)
-    {
+    public int deleteProjectDataByIds(String ids) {
         return projectDataMapper.deleteProjectDataByIds(Convert.toStrArray(ids));
     }
 
     /**
      * 鍒犻櫎椤圭洰璧勬枡淇℃伅
-     * 
+     *
      * @param id 椤圭洰璧勬枡ID
      * @return 缁撴灉
      */
     @Override
-    public int deleteProjectDataById(String id)
-    {
+    public int deleteProjectDataById(String id) {
         return projectDataMapper.deleteProjectDataById(id);
     }
 }

--
Gitblit v1.9.1