From e27668496facc1fc65e19cfafcdcb2d4d5dd3d0a Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 25 Aug 2020 19:29:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0=E4=B8=9A?= =?UTF-8?q?=E7=BB=A9=E6=97=B6=E6=9D=83=E9=87=8D=E5=88=A4=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/common/utils/DingTalkUtil.java | 6 +++++- .../lz/modules/app/controller/ResultRecordController.java | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/lz/common/utils/DingTalkUtil.java b/src/main/java/com/lz/common/utils/DingTalkUtil.java index 2c029589..d18895e4 100644 --- a/src/main/java/com/lz/common/utils/DingTalkUtil.java +++ b/src/main/java/com/lz/common/utils/DingTalkUtil.java @@ -109,7 +109,7 @@ public class DingTalkUtil { req.setHttpMethod("GET"); OapiGettokenResponse rsp = client.execute(req); String resultStr = rsp.getBody(); - logger.info("钉钉请求返回", rsp.getBody()); + logger.info("钉钉请求返回{}", rsp.getBody()); JSONObject dataObj = JSON.parseObject(resultStr); String tenant_access_token = dataObj.getString("access_token"); @@ -143,6 +143,7 @@ public class DingTalkUtil { req.setId("1"); req.setHttpMethod("GET"); OapiDepartmentListResponse rsp = client.execute(req, accessToken); + logger.info("钉钉请求返回{}", rsp.getBody()); JSONObject json = JSONObject.parseObject(rsp.getBody()); if(json.getInteger("errcode") == 0){ JSONArray array = json.getJSONArray("department"); @@ -198,6 +199,7 @@ public class DingTalkUtil { for(long page = 0; isNext; page++){ req.setOffset(page); OapiUserListbypageResponse rsp = client.execute(req, accessToken); + logger.info("钉钉请求返回{}", rsp.getBody()); JSONObject json = JSONObject.parseObject(rsp.getBody()); if(json.getInteger("errcode") == 0){ JSONArray array = json.getJSONArray("userlist"); @@ -309,6 +311,7 @@ public class DingTalkUtil { obj1.setActionCard(obj2); req.setMsg(obj1); OapiMessageCorpconversationAsyncsendV2Response rsp = client.execute(req, token); + logger.info("钉钉请求返回{}", rsp.getBody()); //插入数据库 JSONObject json = JSONObject.parseObject(rsp.getBody()); if(json.getIntValue("errcode") == 0){ @@ -339,6 +342,7 @@ public class DingTalkUtil { req.setCode(code); req.setHttpMethod("GET"); OapiUserGetuserinfoResponse rsp = client.execute(req, token); + logger.info("钉钉请求返回{}", rsp.getBody()); JSONObject json = JSONObject.parseObject(rsp.getBody()); if(json.getIntValue("errcode") == 0){ String employeeId = json.getString("userid"); diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index a168c5a8..187858db 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -444,7 +444,7 @@ public class ResultRecordController extends AbstractController { return R.error("权重不能大于" + compare); } } else { // 添加验证 - if (req.getWeight().setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue() >= compare) { + if (req.getWeight().setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue() > compare) { return R.error("权重不能大于" + compare); } } @@ -457,7 +457,7 @@ public class ResultRecordController extends AbstractController { return R.error("权重之和不能大于" + compare); } } else { //添加验证 - if (new BigDecimal(sum).add(req.getWeight()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue() >= compare) { + if (new BigDecimal(sum).add(req.getWeight()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue() > compare) { return R.error("权重之和不能大于" + compare); } }