Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/ProjectItemServiceImpl.java

@@ -12,6 +12,7 @@ import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -37,6 +38,7 @@ public class ProjectItemServiceImpl implements ProjectItemService {
     public Integer save(ProjectItemDTO copy) {
         TabProjectItem projectItem = EntityUtil.changeEntityByJSON(TabProjectItem.class, copy);
         projectItem.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
+        projectItem.setCreateTime(new Date());
         tabProjectItemMapper.insertSelective(projectItem);
         return projectItem.getProjectItemId();
     }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/PushMessageApiServiceImpl.java

@@ -77,6 +77,10 @@ public class PushMessageApiServiceImpl implements PushMessageApiService {
 
     @Override
     public ServiceResponse<Integer> deletePushType(Integer pushTypeId) {
+        TabPushClassify pushType = this.pushTypeService.getById(pushTypeId);
+        if("系统消息".equals(pushType.getClassifyName())){
+            return ServiceResponse.success();
+        }
         int i = this.pushTypeService.deletePushType(pushTypeId);
         return ServiceResponse.success(i);
     }
@@ -206,7 +210,10 @@ public class PushMessageApiServiceImpl implements PushMessageApiService {
     public ServiceResponse<Integer> readMessage(Integer messageId) {
         int i = this.pushUserMessageService.readMessage(messageId);
         if(i > 0){
-            this.pushMessageService.readCount(messageId);
+            TabPushUserMessage message = this.pushUserMessageService.getById(messageId);
+            if(message != null && message.getMessageId() != null){
+                this.pushMessageService.readCount(message.getMessageId());
+            }
         }
         return ServiceResponse.success(i);
     }