Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

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);
     }