用户模块调整

src/main/java/com/rf/psychological/scale/rest/WebScaleResultController.java

@@ -281,17 +281,7 @@ public class WebScaleResultController extends BaseController {
         filePath = "./心理检测/检测结果/" + new SimpleDateFormat("yyyy-MM-dd").format(new Date()) + "/" + subjectEntities.get(0).getName() + "/" + fileName;
         System.out.println("resultJson:" + resultJson);
         UserRecordEntity userRecordEntity = testRecord(flag, phone, institutionNo, testTime, filePath, JSON.toJSONString(dbJsonList, SerializerFeature.DisableCircularReferenceDetect), subjectEntities.get(0).getName(), JSON.toJSONString(dataList, SerializerFeature.DisableCircularReferenceDetect), testResult, testPlanId);
-//        if (Constant.PROFILE_PUBLIC.equals(profileValue)){
+
-//            //获取测试就id
-//            String resultId = userRecordEntity.getId();
-//            return success(HttpStatus.SUCCESS_PUB,resultId,"成功");
-//        }else {
-//            if (versionFlag) {
-//                return success(newResultJson, "完成");
-//            } else {
-//                return success(dbJsonList, "完成");
-//            }
-//        }
         return success(userRecordEntity.getId(),"完成");
 
     }

src/main/java/com/rf/psychological/user/rest/SystemController.java

@@ -165,10 +165,7 @@ public class SystemController extends BaseController {
                 return fail(null, "用户未审核，请联系管理员");
             }
             if (userEntity.getPassword().equals(password)) {
-                //当用户状态变为重置密码状态时，再重新登录后变为正常使用状态
+
-//                if (UserStatus.UPDATE.getType().equals(userStatus)) {
-//                    userService.updateUserStatus(UserStatus.PASS.getType(), userEntity.getId());
-//                }
                 //生成token
                 userEntity.setPassword(null);
                 String token = JWTUtil.getTokenByUserInfo(userEntity);