|
@@ -6,9 +6,11 @@ import com.dgtly.common.annotation.ApiPassToken;
|
|
import com.dgtly.common.core.controller.ApiBaseController;
|
|
import com.dgtly.common.core.controller.ApiBaseController;
|
|
import com.dgtly.common.core.domain.AjaxResult;
|
|
import com.dgtly.common.core.domain.AjaxResult;
|
|
import com.dgtly.common.core.domain.ParameterObject;
|
|
import com.dgtly.common.core.domain.ParameterObject;
|
|
|
|
+import com.dgtly.common.core.domain.Ztree;
|
|
import com.dgtly.common.utils.http.HttpUtils;
|
|
import com.dgtly.common.utils.http.HttpUtils;
|
|
import com.dgtly.common.utils.security.EncryptPassWordClass;
|
|
import com.dgtly.common.utils.security.EncryptPassWordClass;
|
|
import com.dgtly.system.service.ISysConfigService;
|
|
import com.dgtly.system.service.ISysConfigService;
|
|
|
|
+import com.dgtly.system.service.ISysUserOrderAuthorService;
|
|
import com.dgtly.wxportal.mapper.WxSendMessageMapper;
|
|
import com.dgtly.wxportal.mapper.WxSendMessageMapper;
|
|
import com.dgtly.wxportal.domain.SendOrderNoticeTaskModel;
|
|
import com.dgtly.wxportal.domain.SendOrderNoticeTaskModel;
|
|
import com.dgtly.wxportal.utils.qywxutils.QyWxSendMessageUtil;
|
|
import com.dgtly.wxportal.utils.qywxutils.QyWxSendMessageUtil;
|
|
@@ -57,6 +59,8 @@ public class WxController extends ApiBaseController {
|
|
@Autowired
|
|
@Autowired
|
|
private WxSendMessageMapper wxSendMessageMapper;
|
|
private WxSendMessageMapper wxSendMessageMapper;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private ISysUserOrderAuthorService sysUserOrderAuthorService;
|
|
|
|
|
|
@ApiOperation(value = "获取微信授权跳转url",notes = "参数:{url:www.baidu.com}")
|
|
@ApiOperation(value = "获取微信授权跳转url",notes = "参数:{url:www.baidu.com}")
|
|
@ApiImplicitParams({
|
|
@ApiImplicitParams({
|
|
@@ -475,6 +479,8 @@ public class WxController extends ApiBaseController {
|
|
}
|
|
}
|
|
String pass = EncryptPassWordClass.encryptPassword(user.getLoginName(),password,user.getSalt());
|
|
String pass = EncryptPassWordClass.encryptPassword(user.getLoginName(),password,user.getSalt());
|
|
if(pass.equals(user.getPassword())){
|
|
if(pass.equals(user.getPassword())){
|
|
|
|
+ List<Ztree> author = sysUserOrderAuthorService.userAuthorTreeData(user.getUserId());
|
|
|
|
+ user.setAuthor(author);
|
|
return AjaxResult.success().putKV("sysUser",user);
|
|
return AjaxResult.success().putKV("sysUser",user);
|
|
}else{
|
|
}else{
|
|
return AjaxResult.error(301,"密码错误");
|
|
return AjaxResult.error(301,"密码错误");
|