Commit 40c60848 authored by liqin's avatar liqin 💬

bug fixed

parent 12441ee8
...@@ -188,10 +188,14 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> ...@@ -188,10 +188,14 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog>
if (methodLog.operType().getCode().equals(OperType.AUDIT.getCode())) { if (methodLog.operType().getCode().equals(OperType.AUDIT.getCode())) {
AuditStatusParam auditStatusParam = (AuditStatusParam) method_param[0]; AuditStatusParam auditStatusParam = (AuditStatusParam) method_param[0];
Audit byId = auditService.getById(auditStatusParam.getId()); Audit byId = auditService.getById(auditStatusParam.getId());
type = byId.getType(); if (byId != null) {
status = auditStatusParam.getStatus(); type = byId.getType();
if (AuditStatusEnum.REFUSED.name().equals(status)) { status = auditStatusParam.getStatus();
sysLog.setOperationContent(AuditStatusEnum.REFUSED.getMsg()); if (AuditStatusEnum.REFUSED.name().equals(status)) {
sysLog.setOperationContent(AuditStatusEnum.REFUSED.getMsg());
} else {
sysLog.setOperationContent(AuditStatusEnum.APPROVED_FINAL.getMsg());
}
} else { } else {
sysLog.setOperationContent(AuditStatusEnum.APPROVED_FINAL.getMsg()); sysLog.setOperationContent(AuditStatusEnum.APPROVED_FINAL.getMsg());
} }
......
...@@ -660,7 +660,7 @@ public class ChinaMobileRestApiController extends BaseController { ...@@ -660,7 +660,7 @@ public class ChinaMobileRestApiController extends BaseController {
current = currentList.get(0); current = currentList.get(0);
} }
Map map = new HashMap(); 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("versionNo", current.getAppVersion());
map.put("versionUrl", current.getApkUrl()); map.put("versionUrl", current.getApkUrl());
map.put("updateLog", current.getUpdateLog()); map.put("updateLog", current.getUpdateLog());
...@@ -668,7 +668,6 @@ public class ChinaMobileRestApiController extends BaseController { ...@@ -668,7 +668,6 @@ public class ChinaMobileRestApiController extends BaseController {
return getResult(map); return getResult(map);
} }
@ApiOperation(value = "app界面图片查询") @ApiOperation(value = "app界面图片查询")
@GetMapping(value = "/app/picSelect") @GetMapping(value = "/app/picSelect")
//@RequiresAuthentication //@RequiresPermissions("app:pic:select") //@RequiresAuthentication //@RequiresPermissions("app:pic:select")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment