|
@@ -219,7 +219,7 @@ public class PasswordIssController {
|
|
|
String end = sdf.format(Long.valueOf(ciq.getEndTime()));
|
|
String end = sdf.format(Long.valueOf(ciq.getEndTime()));
|
|
|
unlocking.setStartTime(start);
|
|
unlocking.setStartTime(start);
|
|
|
unlocking.setEndTime(end);
|
|
unlocking.setEndTime(end);
|
|
|
-// unlocking.setType("4");
|
|
|
|
|
|
|
+ unlocking.setType("4");
|
|
|
|
|
|
|
|
|
|
|
|
|
return unlocking;
|
|
return unlocking;
|
|
@@ -362,6 +362,7 @@ public class PasswordIssController {
|
|
|
String passWord2 = AesUtils.decrypt(temporaryPassword, luid);
|
|
String passWord2 = AesUtils.decrypt(temporaryPassword, luid);
|
|
|
UnlockingAdmin unlocking = new UnlockingAdmin();
|
|
UnlockingAdmin unlocking = new UnlockingAdmin();
|
|
|
unlocking.setPassWord(passWord);
|
|
unlocking.setPassWord(passWord);
|
|
|
|
|
+
|
|
|
// 锁用户id
|
|
// 锁用户id
|
|
|
String id = data.getString("id");
|
|
String id = data.getString("id");
|
|
|
unlocking.setLockUserId(id);
|
|
unlocking.setLockUserId(id);
|