Merge remote-tracking branch 'origin/dev' into dev

sso-server/src/main/java/com/uas/sso/controller/YunCenterController.java

@@ -138,7 +138,7 @@ public class YunCenterController extends BaseController {
      */
     @RequestMapping(value = "/disagree/apply", method = RequestMethod.POST)
     @ResponseBody
-    public ModelMap disagreeApply(Long applyUserUU, Long id) {
+    public ModelMap disagreeApply(@RequestParam(name = "userUU") Long applyUserUU, Long id) {
         UserAccount userAccount = getLoginUser();
         if (userAccount.getSpaceUU() == null) {
             return error(String.valueOf(Const.SPACEUU_PERSONAL), "个人账号");

sso-server/src/main/java/com/uas/sso/entity/ApplyUserSpace.java

@@ -80,7 +80,7 @@ public class ApplyUserSpace implements Serializable {
     public ApplyUserSpace(User user, Userspace userspace) {
         this.userUU = user.getUserUU();
         this.spaceUU = userspace.getSpaceUU();
-        this.status = Status.TO_BE_CERTIFIED.getCode();
+        this.status = Status.UNAUDIT.getCode();
         this.submitDate = new Timestamp(System.currentTimeMillis());
     }
 

sso-server/src/main/java/com/uas/sso/service/impl/UserServiceImpl.java

@@ -285,7 +285,9 @@ public class UserServiceImpl implements UserService {
 
         User oldUser = userDao.findByUserUU(user.getUserUU());
         oldUser.setIdentityValidCode((short) Status.TO_BE_CERTIFIED.getCode());
-        userDao.save(oldUser);
+        oldUser.setRealName(user.getRealName());
+        oldUser.setIdCard(user.getIdCard());
+        this.save(oldUser);
         // 保存日志
         userValidService.submitValid(user);
     }
@@ -473,6 +475,7 @@ public class UserServiceImpl implements UserService {
 
         // 保存并添加日志
         user = userDao.save(user);
+        syncUserInfo(user, null, "修改密保");
         userLog.info(user, Type.UPDATE_QUESTION.getValue(), JSON.toJSONString(user.getQuestions()));
     }