Merge branch 'dev' of http://111.203.232.171:8888/lee/chnmuseum-party

src/main/java/cn/wisenergy/chnmuseum/party/common/log/SystemOperationLogService.java

@@ -188,10 +188,14 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog>
             if (methodLog.operType().getCode().equals(OperType.AUDIT.getCode())) {
                 AuditStatusParam auditStatusParam = (AuditStatusParam) method_param[0];
                 Audit byId = auditService.getById(auditStatusParam.getId());
-                type = byId.getType();
-                status = auditStatusParam.getStatus();
-                if (AuditStatusEnum.REFUSED.name().equals(status)) {
-                    sysLog.setOperationContent(AuditStatusEnum.REFUSED.getMsg());
+                if (byId != null) {
+                    type = byId.getType();
+                    status = auditStatusParam.getStatus();
+                    if (AuditStatusEnum.REFUSED.name().equals(status)) {
+                        sysLog.setOperationContent(AuditStatusEnum.REFUSED.getMsg());
+                    } else {
+                        sysLog.setOperationContent(AuditStatusEnum.APPROVED_FINAL.getMsg());
+                    }
                 } else {
                     sysLog.setOperationContent(AuditStatusEnum.APPROVED_FINAL.getMsg());
                 }

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java

@@ -660,7 +660,7 @@ public class ChinaMobileRestApiController extends BaseController {
             current = currentList.get(0);
         }
         Map map = new HashMap();
-        map.put("isLatest", versionNo.equals(current.getAppVersion()));
+        map.put("isLatest", versionNo.equalsIgnoreCase(current.getAppVersion()));
         map.put("versionNo", current.getAppVersion());
         map.put("versionUrl", current.getApkUrl());
         map.put("updateLog", current.getUpdateLog());
@@ -668,7 +668,6 @@ public class ChinaMobileRestApiController extends BaseController {
         return getResult(map);
     }
 
-
     @ApiOperation(value = "app界面图片查询")
     @GetMapping(value = "/app/picSelect")
     //@RequiresAuthentication  //@RequiresPermissions("app:pic:select")