From 2c7a43e08995402d310a1e4bd74cf6ed8ce13e70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AD=A6?= <吴æ武慧娟>
Date: Tue, 10 Dec 2019 17:18:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ccsens/cloudutil/aspect/LogAspect.java    | 15 +++++++--------
 .../java/com/ccsens/ht/service/DoctorService.java |  3 +++
 util/src/main/java/com/ccsens/util/CodeEnum.java  |  1 +
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/aspect/LogAspect.java b/cloudutil/src/main/java/com/ccsens/cloudutil/aspect/LogAspect.java
index 374a3141..434ab169 100644
--- a/cloudutil/src/main/java/com/ccsens/cloudutil/aspect/LogAspect.java
+++ b/cloudutil/src/main/java/com/ccsens/cloudutil/aspect/LogAspect.java
@@ -14,6 +14,7 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
@@ -96,14 +97,10 @@ public class LogAspect {
         //参数
         Object[] args = pjp.getArgs();
         StringBuilder param = new StringBuilder();
-        //方法注解
-
-        Class<?>[] argTypes = new Class[args.length];
         for (int i = 0; i < args.length; i++) {
-            //参数类型
-            argTypes[i] = args[i].getClass();
-            //参数值
-            if (args[i] instanceof ServletResponse) {
+            if (args[i] == null) {
+                continue;
+            }else if (args[i] instanceof ServletResponse) {
                 continue;
             } else if (args[i] instanceof ServletRequest) {
                 Object claims = request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS);
@@ -111,6 +108,7 @@ public class LogAspect {
                 if (userId != null) {
                     param.append("userId:").append(userId).append("--");
                 }
+
             } else if (args[i] instanceof Part) {
                 param.append("file:").append(UploadFileUtil_Servlet3.getFileNameByPart((Part)args[i])).append("--");
             }else {
@@ -120,7 +118,8 @@ public class LogAspect {
         }
         dto.setParams(param.length() > 1000 ? param.substring(0, 1000) : param.toString());
         try {
-            Method  method = pjp.getTarget().getClass().getMethod(pjp.getSignature().getName(), argTypes);
+            MethodSignature methodSignature = (MethodSignature) pjp.getSignature();
+            Method  method = pjp.getTarget().getClass().getMethod(methodSignature.getName(), methodSignature.getParameterTypes());
             ApiOperation annotation = method.getAnnotation(ApiOperation.class);
             dto.setMethodDesc(annotation == null ? "" : annotation.value());
         } catch (Exception e) {
diff --git a/ht/src/main/java/com/ccsens/ht/service/DoctorService.java b/ht/src/main/java/com/ccsens/ht/service/DoctorService.java
index 56b92b97..8c520fa4 100644
--- a/ht/src/main/java/com/ccsens/ht/service/DoctorService.java
+++ b/ht/src/main/java/com/ccsens/ht/service/DoctorService.java
@@ -75,6 +75,9 @@ public class DoctorService implements IDoctorService {
             log.info("{}未找到对应职务。", submit.getPositionId());
             return JsonResponse.newInstance().ok(CodeEnum.POSITION_NO_FOUND);
         }
+        if (!Constant.Ht.Position.isJob(position.getType())) {
+            return JsonResponse.newInstance().ok(CodeEnum.POSITION_NOT_3);
+        }
         //判断职务是否存在
         HtTitle htTitle = htTitleDao.selectByPrimaryKey(submit.getTitleId());
         if (htTitle == null) {
diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java
index 21010634..c6168fe2 100644
--- a/util/src/main/java/com/ccsens/util/CodeEnum.java
+++ b/util/src/main/java/com/ccsens/util/CodeEnum.java
@@ -61,6 +61,7 @@ public enum CodeEnum {
     QUESTION_RULE_NOT_FOUND(47,"该评测规则未知，请联系开发人员。", true),
     REPORT_DOCTOR_ERROR(48, "对不起，您没有修改报告单结果的权限。", true),
     NOT_LOGIN(49, "对不起，您尚未登录或登录已失效，请重新登录。", true),
+    POSITION_NOT_3(50, "对不起，您尚未选择职务，请重新选择。", true),
     ;
 
     public CodeEnum addMsg(String msg){