Commit dc6320a5 authored by 赵啸非's avatar 赵啸非

添加照片海康下载

parent a74e3019
......@@ -105,14 +105,14 @@ public class DingTalkLoginController extends BaseCRUDJsonBodyMappingController<U
}
if (ObjectUtils.isEmpty(personRest.getData()))
throw new AppException(REGISTER_AUTH_FAIL, "不存在当前匹配的钉钉关联用户!");
throw new AppException(1012, "未找到响应的钉钉用户!");
//根据钉钉的用户查询系统绑定的用户,获取
UserQuery userQuery = new UserQuery();
userQuery.setDingUserId(personRest.getData());
userEntity = userService.selectOne(userQuery);
if (ObjectUtils.isEmpty(userEntity)) {
ret.put("openId", personRest.getData());
throw new AppException(REGISTER_AUTH_FAIL, "不存在当前匹配的钉钉关联用户!");
throw new AppException(REGISTER_AUTH_FAIL, "不存在当前匹配的钉钉关联用户2!");
}
data.put("id", userEntity.getId());
......
......@@ -23,4 +23,6 @@ public class FeedbackVo extends BaseEntityLong {
private Long feedbackId;
/** 反馈状态 */
private Integer backStatus;
}
\ No newline at end of file
package com.mortals.xhx.module.feedback.service.impl;
import cn.hutool.core.date.DateUtil;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
import com.mortals.xhx.module.feedback.model.*;
......@@ -37,6 +38,18 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
@Autowired
private FeedbackStaffService feedbackStaffService;
@Override
protected void findAfter(FeedbackEntity entity, Context context, List<FeedbackEntity> list) throws AppException {
list.stream().forEach(item->{
Date feedbackTimeStart = item.getFeedbackTimeStart();
Date feedbackTimeEnd = item.getFeedbackTimeEnd();
// if(DateUtil.compare())
});
}
@Override
protected void saveBefore(FeedbackEntity entity, Context context) throws AppException {
super.saveBefore(entity,context);
......
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