|
@@ -6,6 +6,7 @@ import com.uas.sso.dao.AppealDao;
|
|
|
import com.uas.sso.entity.Appeal;
|
|
import com.uas.sso.entity.Appeal;
|
|
|
import com.uas.sso.entity.User;
|
|
import com.uas.sso.entity.User;
|
|
|
import com.uas.sso.entity.Userspace;
|
|
import com.uas.sso.entity.Userspace;
|
|
|
|
|
+import com.uas.sso.exception.VisibleError;
|
|
|
import com.uas.sso.service.AppealService;
|
|
import com.uas.sso.service.AppealService;
|
|
|
import com.uas.sso.service.UserService;
|
|
import com.uas.sso.service.UserService;
|
|
|
import com.uas.sso.service.UserspaceService;
|
|
import com.uas.sso.service.UserspaceService;
|
|
@@ -45,6 +46,10 @@ public class AppealServiceImpl implements AppealService {
|
|
|
appeal.setSubmitInfo(JSON.toJSONString(data));
|
|
appeal.setSubmitInfo(JSON.toJSONString(data));
|
|
|
appeal.setStatus((short) Status.TO_BE_CERTIFIED.getCode());
|
|
appeal.setStatus((short) Status.TO_BE_CERTIFIED.getCode());
|
|
|
appeal.setType(Appeal.Type.RESET_PASSWORD.getDesc());
|
|
appeal.setType(Appeal.Type.RESET_PASSWORD.getDesc());
|
|
|
|
|
+ if (SystemSession.getUserAccount() != null) {
|
|
|
|
|
+ appeal.setSubmitterUU(SystemSession.getUserAccount().getUserUU());
|
|
|
|
|
+ appeal.setSubmitterName(SystemSession.getUserAccount().getVipName());
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
// 保存申述信息
|
|
// 保存申述信息
|
|
|
appealDao.save(appeal);
|
|
appealDao.save(appeal);
|
|
@@ -67,6 +72,10 @@ public class AppealServiceImpl implements AppealService {
|
|
|
appeal.setSubmitInfo(JSON.toJSONString(data));
|
|
appeal.setSubmitInfo(JSON.toJSONString(data));
|
|
|
appeal.setStatus((short) Status.TO_BE_CERTIFIED.getCode());
|
|
appeal.setStatus((short) Status.TO_BE_CERTIFIED.getCode());
|
|
|
appeal.setType(Appeal.Type.CHANGE_ADMIN.getDesc());
|
|
appeal.setType(Appeal.Type.CHANGE_ADMIN.getDesc());
|
|
|
|
|
+ if (SystemSession.getUserAccount() != null) {
|
|
|
|
|
+ appeal.setSubmitterUU(SystemSession.getUserAccount().getUserUU());
|
|
|
|
|
+ appeal.setSubmitterName(SystemSession.getUserAccount().getVipName());
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
// 保存申述信息
|
|
// 保存申述信息
|
|
|
appealDao.save(appeal);
|
|
appealDao.save(appeal);
|
|
@@ -76,6 +85,9 @@ public class AppealServiceImpl implements AppealService {
|
|
|
@Override
|
|
@Override
|
|
|
public void submitValidAccount(Appeal appeal, String password) {
|
|
public void submitValidAccount(Appeal appeal, String password) {
|
|
|
// 设置默认信息
|
|
// 设置默认信息
|
|
|
|
|
+ if (SystemSession.getUserAccount() == null) {
|
|
|
|
|
+ throw new VisibleError("用户未登录");
|
|
|
|
|
+ }
|
|
|
appeal.setSubmitDate(new Timestamp(System.currentTimeMillis()));
|
|
appeal.setSubmitDate(new Timestamp(System.currentTimeMillis()));
|
|
|
User user = userService.findOne(appeal.getSubmitterUU());
|
|
User user = userService.findOne(appeal.getSubmitterUU());
|
|
|
ModelMap data = new ModelMap();
|
|
ModelMap data = new ModelMap();
|