|
@@ -562,12 +562,18 @@ public class SysUserController extends BaseController {
|
|
|
SysUser sysUser = sysUserService.getById(userId);
|
|
SysUser sysUser = sysUserService.getById(userId);
|
|
|
if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_2.getCode())) {
|
|
if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_2.getCode())) {
|
|
|
sysUser.setStatus(UserWorkStatus.UWS_1.getCode());
|
|
sysUser.setStatus(UserWorkStatus.UWS_1.getCode());
|
|
|
|
|
+ sysUserService.addInfo(sysUser);
|
|
|
} else if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_4.getCode())) {
|
|
} else if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_4.getCode())) {
|
|
|
sysUser.setStatus(UserWorkStatus.UWS_0.getCode());
|
|
sysUser.setStatus(UserWorkStatus.UWS_0.getCode());
|
|
|
|
|
+
|
|
|
} else if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_6.getCode())) {
|
|
} else if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_6.getCode())) {
|
|
|
sysUser.setStatus(UserWorkStatus.UWS_1.getCode());
|
|
sysUser.setStatus(UserWorkStatus.UWS_1.getCode());
|
|
|
}
|
|
}
|
|
|
- return HttpResult.ok(sysUserService.addInfo(sysUser));
|
|
|
|
|
|
|
+ SysUserTrack sysUserTrack = new SysUserTrack(sysUser);
|
|
|
|
|
+
|
|
|
|
|
+ sysUserTrackService.save(sysUserTrack);
|
|
|
|
|
+
|
|
|
|
|
+ return HttpResult.ok("审批成功");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -582,6 +588,13 @@ public class SysUserController extends BaseController {
|
|
|
SysUser sysUser = sysUserService.getById(userId);
|
|
SysUser sysUser = sysUserService.getById(userId);
|
|
|
if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_2.getCode())) {
|
|
if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_2.getCode())) {
|
|
|
sysUser.setStatus(UserWorkStatus.UWS_3.getCode());
|
|
sysUser.setStatus(UserWorkStatus.UWS_3.getCode());
|
|
|
|
|
+ Integer type = sysUser.getType();
|
|
|
|
|
+ Integer level = sysUser.getLevel();
|
|
|
|
|
+ if (type != 0) {
|
|
|
|
|
+ if (level == null || level != 1) {
|
|
|
|
|
+ sysUserService.sendMsgPantner(sysUser.getMobile());
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
} else if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_4.getCode())) {
|
|
} else if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_4.getCode())) {
|
|
|
sysUser.setStatus(UserWorkStatus.UWS_5.getCode());
|
|
sysUser.setStatus(UserWorkStatus.UWS_5.getCode());
|
|
|
} else if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_6.getCode())) {
|
|
} else if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_6.getCode())) {
|
|
@@ -591,13 +604,6 @@ public class SysUserController extends BaseController {
|
|
|
SysUserTrack sysUserTrack = new SysUserTrack(sysUser);
|
|
SysUserTrack sysUserTrack = new SysUserTrack(sysUser);
|
|
|
sysUserTrack.setApproveMess(reason);
|
|
sysUserTrack.setApproveMess(reason);
|
|
|
sysUserTrackService.save(sysUserTrack);
|
|
sysUserTrackService.save(sysUserTrack);
|
|
|
- Integer type = sysUser.getType();
|
|
|
|
|
- Integer level = sysUser.getLevel();
|
|
|
|
|
- if (type != 0) {
|
|
|
|
|
- if (level == null || level != 1) {
|
|
|
|
|
- sysUserService.sendMsgPantner(sysUser.getMobile());
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
return HttpResult.ok(sysUserService.updateById(sysUser));
|
|
return HttpResult.ok(sysUserService.updateById(sysUser));
|
|
|
|
|
|