diff --git a/src/main/java/com/budwk/app/bpm/models/BpmProcessDefine.java b/src/main/java/com/budwk/app/bpm/models/BpmProcessDefine.java index 6947155..49cb8b6 100644 --- a/src/main/java/com/budwk/app/bpm/models/BpmProcessDefine.java +++ b/src/main/java/com/budwk/app/bpm/models/BpmProcessDefine.java @@ -23,7 +23,7 @@ public class BpmProcessDefine extends BaseModel implements Serializable { private String id; @Column - @ColDefine(type = ColType.VARCHAR,width = 30) + @ColDefine(type = ColType.VARCHAR,width = 100) @Comment("编码") private String code; diff --git a/src/main/java/com/budwk/app/sys/controller/SysLoginController.java b/src/main/java/com/budwk/app/sys/controller/SysLoginController.java index f1b63ab..c6199db 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysLoginController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysLoginController.java @@ -234,4 +234,13 @@ public class SysLoginController { return Result.success(validateService.getCaptcha()); } + + @At(value = "/platform/auth/userInfo",top = true) + @Ok("json") + @ApiOperation("获取登录用户信息") + public Result userInfo(){ + Sys_user user = sysUserService.getUserAndMenuById(SecurityUtil.getUserId()); + return Result.success(user); + } + } diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java index ac5ec22..63474c7 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java @@ -306,7 +306,7 @@ public class SysUserServiceImpl extends BaseServiceImpl implements Sys String decodePwd = Base64Decoder.decodeStr(passowrd); String hashedPassword = PwdUtil.getPassword(decodePwd, user.getSalt()); if (!Strings.sNull(hashedPassword).equalsIgnoreCase(user.getPassword())) { -// throw new BaseException("用户名或者密码不正确"); + throw new BaseException("用户名或者密码不正确"); } user = this.fetchLinks(user, "unit"); if (Lang.isNotEmpty(user.getUnit()) && StrUtil.isNotBlank(user.getUnit().getUnionId())) { diff --git a/src/main/java/com/budwk/app/zhgh/activity/qsv/controller/QsvActivityController.java b/src/main/java/com/budwk/app/zhgh/activity/qsv/controller/QsvActivityController.java index ffd1378..cf55189 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/qsv/controller/QsvActivityController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/qsv/controller/QsvActivityController.java @@ -6,6 +6,7 @@ import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; +import com.budwk.app.sys.models.Sys_home_activity; import com.budwk.app.zhgh.activity.qsv.models.QsvActivity; import com.budwk.app.zhgh.activity.qsv.models.QsvOption; import com.budwk.app.zhgh.activity.qsv.models.QsvSubject; @@ -57,6 +58,7 @@ public class QsvActivityController { @At @SaCheckPermission("qsv.activity") @ApiOperation("保存问卷基础信息") + @Aop(TransAop.READ_COMMITTED) public Result save(QsvActivity qsvActivity) { if (qsvActivity.getCategory().equals("QUIZ")) { if (qsvActivity.getMode().equals("SCHEDULED")) { @@ -66,6 +68,9 @@ public class QsvActivityController { } } dao.insertOrUpdate(qsvActivity); + Sys_home_activity sysHomeActivity = qsvActivity.covertToSysHomeActivity(); + sysHomeActivity.setEnable(true); + dao.insertOrUpdate(sysHomeActivity); return Result.success(); } diff --git a/src/main/java/com/budwk/app/zhgh/activity/qsv/service/impl/QsvQuizRankServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/qsv/service/impl/QsvQuizRankServiceImpl.java index 2b8585e..42675ea 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/qsv/service/impl/QsvQuizRankServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/qsv/service/impl/QsvQuizRankServiceImpl.java @@ -97,7 +97,7 @@ public class QsvQuizRankServiceImpl extends BaseServiceImpl t1.loginName, t1.unitName, t1.unionName, - t1.sex, + u.sex, u.mobile, t1.totalScore, t1.attemptDate, diff --git a/src/main/resources/views/layouts/platform.html b/src/main/resources/views/layouts/platform.html index 219388f..1ae3595 100644 --- a/src/main/resources/views/layouts/platform.html +++ b/src/main/resources/views/layouts/platform.html @@ -261,9 +261,12 @@