|
@@ -285,7 +285,7 @@ public class HaiKangDoorService {
|
|
|
HKUserInfo hKUserInfo = new HKUserInfo();
|
|
HKUserInfo hKUserInfo = new HKUserInfo();
|
|
|
hKUserInfo.setEmployeeNo(haikangUser.getJobNo());
|
|
hKUserInfo.setEmployeeNo(haikangUser.getJobNo());
|
|
|
hKUserInfo.setName(haikangUser.getNickName());
|
|
hKUserInfo.setName(haikangUser.getNickName());
|
|
|
- hKUserInfo.setPassword(haikangUser.getCipher());
|
|
|
|
|
|
|
+// hKUserInfo.setPassword(haikangUser.getCipher());
|
|
|
|
|
|
|
|
if(haikangUser.getInvalidTime() != null){
|
|
if(haikangUser.getInvalidTime() != null){
|
|
|
hKUserInfo.getValid().setEndTime(haikangUser.getInvalidTime());
|
|
hKUserInfo.getValid().setEndTime(haikangUser.getInvalidTime());
|
|
@@ -413,7 +413,7 @@ public class HaiKangDoorService {
|
|
|
labHaikangUserLog.setRemark("新增授权【系统】");
|
|
labHaikangUserLog.setRemark("新增授权【系统】");
|
|
|
labHaikangUserLog.setJoinUserId(haikangUser.getJoinUserId());
|
|
labHaikangUserLog.setJoinUserId(haikangUser.getJoinUserId());
|
|
|
labHaikangUserLog.setHardId(hardId);
|
|
labHaikangUserLog.setHardId(hardId);
|
|
|
- hKUserInfo.setPassword(haikangUser.getCipher());
|
|
|
|
|
|
|
+// hKUserInfo.setPassword(haikangUser.getCipher());
|
|
|
haikangUser.setHardId(hardId);
|
|
haikangUser.setHardId(hardId);
|
|
|
|
|
|
|
|
handlingInsertOrUpdate(ifLogin, haikangUser, hKUserInfo, labHaikangUserLog);
|
|
handlingInsertOrUpdate(ifLogin, haikangUser, hKUserInfo, labHaikangUserLog);
|
|
@@ -503,7 +503,7 @@ public class HaiKangDoorService {
|
|
|
HKUserInfo hKUserInfo = new HKUserInfo();
|
|
HKUserInfo hKUserInfo = new HKUserInfo();
|
|
|
hKUserInfo.setEmployeeNo(haikangUser.getJobNo());
|
|
hKUserInfo.setEmployeeNo(haikangUser.getJobNo());
|
|
|
hKUserInfo.setName(haikangUser.getNickName());
|
|
hKUserInfo.setName(haikangUser.getNickName());
|
|
|
- hKUserInfo.setPassword(haikangUser.getCipher());
|
|
|
|
|
|
|
+// hKUserInfo.setPassword(haikangUser.getCipher());
|
|
|
if(haikangUser.getInvalidTime() != null){
|
|
if(haikangUser.getInvalidTime() != null){
|
|
|
hKUserInfo.getValid().setEndTime(haikangUser.getInvalidTime());
|
|
hKUserInfo.getValid().setEndTime(haikangUser.getInvalidTime());
|
|
|
}
|
|
}
|
|
@@ -721,7 +721,7 @@ public class HaiKangDoorService {
|
|
|
HKUserInfo hKUserInfo = new HKUserInfo();
|
|
HKUserInfo hKUserInfo = new HKUserInfo();
|
|
|
hKUserInfo.setEmployeeNo(haikangUser.getJobNo());
|
|
hKUserInfo.setEmployeeNo(haikangUser.getJobNo());
|
|
|
hKUserInfo.setName(haikangUser.getNickName());
|
|
hKUserInfo.setName(haikangUser.getNickName());
|
|
|
- hKUserInfo.setPassword(haikangUser.getCipher());
|
|
|
|
|
|
|
+
|
|
|
if(haikangUser.getInvalidTime() != null){
|
|
if(haikangUser.getInvalidTime() != null){
|
|
|
hKUserInfo.getValid().setEndTime(haikangUser.getInvalidTime());
|
|
hKUserInfo.getValid().setEndTime(haikangUser.getInvalidTime());
|
|
|
}
|
|
}
|
|
@@ -729,6 +729,7 @@ public class HaiKangDoorService {
|
|
|
hKUserInfo.setUserVerifyMode(UserVerifyMode.valueOf(haikangUser.getVerifyMode()));
|
|
hKUserInfo.setUserVerifyMode(UserVerifyMode.valueOf(haikangUser.getVerifyMode()));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ hKUserInfo.setPassword(haikangUser.getCipher());
|
|
|
HaikangResult result = UserManage.AddUserInfo(hKUserInfo);
|
|
HaikangResult result = UserManage.AddUserInfo(hKUserInfo);
|
|
|
if(result.getStatusCode() == 1){
|
|
if(result.getStatusCode() == 1){
|
|
|
labHaikangUserMapper.update(haikangUser);
|
|
labHaikangUserMapper.update(haikangUser);
|
|
@@ -831,7 +832,7 @@ public class HaiKangDoorService {
|
|
|
HKUserInfo hKUserInfo = new HKUserInfo();
|
|
HKUserInfo hKUserInfo = new HKUserInfo();
|
|
|
hKUserInfo.setEmployeeNo(haikangUser.getJobNo());
|
|
hKUserInfo.setEmployeeNo(haikangUser.getJobNo());
|
|
|
hKUserInfo.setName(haikangUser.getNickName());
|
|
hKUserInfo.setName(haikangUser.getNickName());
|
|
|
- hKUserInfo.setPassword(haikangUser.getCipher());
|
|
|
|
|
|
|
+// hKUserInfo.setPassword(haikangUser.getCipher());
|
|
|
haikangUser.setVerifyType(1);
|
|
haikangUser.setVerifyType(1);
|
|
|
haikangUser.setHardId(hardware.getId());
|
|
haikangUser.setHardId(hardware.getId());
|
|
|
if(StringUtils.isNotBlank(haikangUser.getCardNo())){
|
|
if(StringUtils.isNotBlank(haikangUser.getCardNo())){
|
|
@@ -916,6 +917,7 @@ public class HaiKangDoorService {
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ hKUserInfo.setPassword(haikangUser.getCipher());
|
|
|
HaikangResult result = UserManage.AddUserInfo(hKUserInfo);
|
|
HaikangResult result = UserManage.AddUserInfo(hKUserInfo);
|
|
|
if(result.getStatusCode() == 1){
|
|
if(result.getStatusCode() == 1){
|
|
|
haikangUser.setState(true);
|
|
haikangUser.setState(true);
|