zhangqiankun 2 anni fa
parent
commit
19bc7fbca5

+ 2 - 10
src/main/java/com/persagy/calendar/aop/UserAgentInterceptor.java

@@ -43,17 +43,9 @@ public class UserAgentInterceptor extends HandlerInterceptorAdapter {
 			if (browser == null || "Unknown".equalsIgnoreCase(browser.getName())) {
 				throw new BusinessException("非法请求");
 			}
-			String appToken = request.getHeader("app-token");
-			if (StringUtil.isBlank(appToken)) {
-				throw new BusinessException("非法请求");
-			}
-			String[] split = appToken.split("-");
-			if (split.length < 2) {
-				throw new BusinessException("非法请求");
-			}
+			String token = request.getHeader("Authorization");
 			JSONObject params = new JSONObject();
-			params.put("userId", split[0]);
-			params.put("token", split[1]);
+			params.put("token", token);
 			
 			String url = personUrl + "/user/checkToken";
 			String responseStr = HttpUtil.createPost(url).body(params.toJSONString(),

+ 4 - 4
src/main/java/com/persagy/calendar/controller/WorkCalendarController.java

@@ -31,6 +31,7 @@ import com.persagy.common.utils.ResponseUtil;
 import com.persagy.common.utils.StringUtil;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 
 /**
  * 工作历主表
@@ -67,10 +68,9 @@ public class WorkCalendarController {
 		}
     	
     	if (StringUtil.isNotBlank(queryVO.getObjId()) && StringUtil.isBlank(queryVO.getId())) {
-    		QueryWrapper<WorkCalendarObject> queryWrapper = new WorkCalendarObject.Builder().createQueryWrapper()
-    				.groupCodeEq(queryVO.getGroupCode()).projectIdEq(queryVO.getProjectId())
-    				.objectIdEq(queryVO.getObjId()).builderQueryWrapper();
-			WorkCalendarObject calendarObject = this.workCalendarObjectService.getOne(queryWrapper);
+    		WorkCalendarObject calendarObject = this.workCalendarObjectService.lambdaQuery().eq(StrUtil.isNotBlank(queryVO.getGroupCode()), WorkCalendarObject::getGroupCode, queryVO.getGroupCode())
+    				.eq(StrUtil.isNotBlank(queryVO.getProjectId()), WorkCalendarObject::getProjectId, queryVO.getProjectId())
+    				.eq(StrUtil.isNotBlank(queryVO.getObjId()), WorkCalendarObject::getObjectId, queryVO.getObjId()).one();
 			if (calendarObject == null) {
 				return ResponseUtil.successResult(Lists.newArrayList());
 			}