修改

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.xml

@@ -6,5 +6,6 @@
         <where>
             ${ew.sqlSegment}
         </where>
+        order by orderDate desc
     </select>
 </mapper>

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java

@@ -94,10 +94,12 @@ public class ProjectDailyRest {
                     getOne(new QueryWrapper<MessagePushLog>().
                             eq("projectSid",ProjectDailys.getProjectSid()).
                             eq("orderDate",ProjectDailys.getOrderDate()));
-            MessageOpenid messageOpenid=messageOpenidService.getOne(new QueryWrapper<MessageOpenid>().eq("openId",sysUser.getAppletOpenid()).eq("messageSid",m.getSid()));
-            if(null!=messageOpenid){
-                messageOpenid.setState("1");
-                messageOpenidService.updateById(messageOpenid);
+            if(null!=m){
+                MessageOpenid messageOpenid=messageOpenidService.getOne(new QueryWrapper<MessageOpenid>().eq("openId",sysUser.getAppletOpenid()).eq("messageSid",m.getSid()));
+                if(null!=messageOpenid){
+                    messageOpenid.setState("1");
+                    messageOpenidService.updateById(messageOpenid);
+                }
             }
         }else if(StringUtils.isNotNull(ProjectDailys.getWxCode())&!ProjectDailys.getWxCode().equals("")){
             ResultBean<JSONObject> rbJsonObject = wxLogin(ProjectDailys.getWxCode(), APP_ID,SECRET);
@@ -113,10 +115,12 @@ public class ProjectDailyRest {
             }
             MessagePushLog m=messagePushLogService.getOne(new QueryWrapper<MessagePushLog>()
                     .eq("projectSid",ProjectDailys.getProjectSid()).eq("orderDate",ProjectDailys.getOrderDate()));
-            MessageOpenid messageOpenid=messageOpenidService.getOne(new QueryWrapper<MessageOpenid>().eq("openId",openid).eq("messageSid",m.getSid()));
-            if(null!=messageOpenid){
-                messageOpenid.setState("1");
-                messageOpenidService.updateById(messageOpenid);
+            if(null!=m){
+                MessageOpenid messageOpenid=messageOpenidService.getOne(new QueryWrapper<MessageOpenid>().eq("openId",openid).eq("messageSid",m.getSid()));
+                if(null!=messageOpenid){
+                    messageOpenid.setState("1");
+                    messageOpenidService.updateById(messageOpenid);
+                }
             }
         }else if ((StringUtils.isNull(ProjectDailys.getWxCode())|ProjectDailys.getWxCode().equals("")) && (StringUtils.isNull(ProjectDailys.getUserSid())|ProjectDailys.getUserSid().equals(""))){
             return rb.setMsg("无权限").setCode("410");