From 2783e02b1e99a1d612c1039073f41e854453b1cf Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 22 Jul 2021 10:26:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=96=B0=E5=A2=9Ebug=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/common/ActDefineStartMap.java | 1 + .../adc/da/slrs/sarUrl/controller/TsUrlController.java | 8 ++++++-- .../main/java/com/adc/da/slrs/sarUrl/dao/TsUrlDao.java | 2 +- .../com/adc/da/slrs/sarUrl/service/ITsUrlService.java | 2 +- .../adc/da/slrs/sarUrl/service/impl/TsUrlServiceImpl.java | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index 7fede944..a229d7d1 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -19,6 +19,7 @@ public class ActDefineStartMap { map.put("3","standardCommentProcessWorkFlow"); map.put("4","standardregulatoryinventory"); map.put("5","projectEvaluationProcess"); + map.put("6","Projectcomplianceassessment"); map.put("8","nonConformanceRectificationKey"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java index 6289f618..11a87b73 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java @@ -51,8 +51,12 @@ public class TsUrlController{ @ApiOperation(value="第三方链接-添加", notes="第三方链接-添加") @PostMapping(value = "/add") public ResponseMessage add(@RequestBody TsUrl tsUrl) { - int orderBy=tsUrlService.getMaxOrderBy(); - tsUrl.setOrderBy(orderBy+1); + String orderBy=tsUrlService.getMaxOrderBy(); + if (null!=orderBy) { + tsUrl.setOrderBy(Integer.valueOf(orderBy) + 1); + }else { + tsUrl.setOrderBy(1); + } tsUrlService.save(tsUrl); return Result.success(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/dao/TsUrlDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/dao/TsUrlDao.java index ab94703f..e3ecaf62 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/dao/TsUrlDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/dao/TsUrlDao.java @@ -18,5 +18,5 @@ public interface TsUrlDao extends BaseMapper { * @return int */ @Select("select max(order_by) from ts_url") - int getMaxOrderBy(); + String getMaxOrderBy(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/ITsUrlService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/ITsUrlService.java index bfe81d66..ab1bf403 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/ITsUrlService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/ITsUrlService.java @@ -20,7 +20,7 @@ public interface ITsUrlService extends IService { * 获取最大排序号 * @return int */ - int getMaxOrderBy(); + String getMaxOrderBy(); /** * 排序 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/impl/TsUrlServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/impl/TsUrlServiceImpl.java index 0480a39b..f4ac3d98 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/impl/TsUrlServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/service/impl/TsUrlServiceImpl.java @@ -31,7 +31,7 @@ public class TsUrlServiceImpl extends ServiceImpl implements IT * @return int */ @Override - public int getMaxOrderBy() { + public String getMaxOrderBy() { return tsUrlDao.getMaxOrderBy(); }