From 6781c145b2ba379b479ef8369a0d4af1cb0af527 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Wed, 31 Mar 2021 11:05:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=8F=90=E5=8D=95=E4=BA=BA?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=EF=BC=8CPC=E5=92=8C=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=99=BB=E5=BD=95=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guarantee/controller/DgApplyAmountInfoController.java | 2 ++ .../hrauth/service/impl/UserLoginServiceImpl.java | 8 ++++++-- .../framework/domain/hrms/request/LoginRequest.java | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java index dc0899fd..52f81621 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java @@ -212,6 +212,8 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA if(response.getPresenterId().equals(res.get("id"))){//如果提单人id相同情况下，就往对象里面赋值 response.setAccount(JSONObject.toJSONString(res.get("account")).replace("\"","")); response.setDeptName(JSONObject.toJSONString(res.get("deptName")).replace("\"","")); + }else{ + response.setAccount("客户"); } } } diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java index c1afb9fc..0a03a32c 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java @@ -241,7 +241,11 @@ public class UserLoginServiceImpl extends ServiceImpl } recordsLog.setAccount(userEntity.getAccount()); recordsLog.setName(name); - recordsLog.setType(0);//用户端类型：0->PC；1->小程序； + if(loginRequest.getType()==3 || loginRequest.getType()==4){//小程序登录 + recordsLog.setType(1);//用户端类型：0->PC；1->小程序； + }else{ + recordsLog.setType(0); + } recordsLog.setLoginTime(new Date()); recordsLog.setUserId(userEntity.getId().intValue()); hrmsAccessRecordsLogMapper.insert(recordsLog); @@ -401,7 +405,7 @@ public class UserLoginServiceImpl extends ServiceImpl //查询员工数据 int count2 = userLoginDao.selectUserEmpCount(md5UnionId); if(identify==0){//员工小程序登录 - loginRequest.setType(2); + loginRequest.setType(4); if(count<=0 || count2<=0){//如果微信绑定的不是员工 return ResponseResult.FAIL(60001,"您的账号没有权限，无法登录！"); } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/request/LoginRequest.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/request/LoginRequest.java index 4350cc08..4db3d5fb 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/request/LoginRequest.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/request/LoginRequest.java @@ -11,7 +11,7 @@ public class LoginRequest { @ApiModelProperty(value = "手机号码/账号") private String phone; - @ApiModelProperty(value = "登录类型(1:手机号 2:微信登录 3:客户小程序登录)") + @ApiModelProperty(value = "登录类型(1:手机号 2:微信扫码登录 3:客户小程序登录 4：企业小程序登录)") private int type; @ApiModelProperty(value = "微信唯一编号(unionId)")