diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysWechatController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysWechatController.java index 5979555..b521c09 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysWechatController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysWechatController.java @@ -79,7 +79,7 @@ public class SysWechatController { @Ok("re") public String oauth(@Param("redirectUrl") String redirectUrl) { // String redirect = Globals.AppDomain + "platform/wechat/getCode"; - String redirect = "http://zhgh.hrbnu.edu.cn/platform/wechat/getCode"; + String redirect = "https://zhgh.hrbnu.edu.cn/platform/wechat/getCode"; if (StrUtil.isNotBlank(redirectUrl)) { redirect += "?redirect=" + redirectUrl; } @@ -129,8 +129,10 @@ public class SysWechatController { log.error(">>> openid 加密失败：{}", openid); } try { - return ">>:" + Globals.AppDomain + "mobile/login?state=" + URLEncoder.encode(encrypt, "UTF-8"); - } catch (UnsupportedEncodingException e) { +// return ">>:" + Globals.AppDomain + "mobile/login?state=" + URLEncoder.encode(encrypt, "UTF-8"); +// return ">>:" + "http://zhgh.hrbnu.edu.cn/mobile/login?state=" + URLEncoder.encode(encrypt, "UTF-8"); + return ">>:" + "https://zhgh.hrbnu.edu.cn/mobile/login?state=" + openid; + } catch (Exception e) { log.error(">>> 请求转发失败：{}", openid); } } @@ -142,16 +144,16 @@ public class SysWechatController { if (StrUtil.isNotBlank(redirect)) { return ">>:" + redirect; } - return ">>:" + Globals.AppDomain + "/mobile/index"; + return ">>:" + "https://zhgh.hrbnu.edu.cn/mobile/index"; } catch (LockedAccountException e) { request.setAttribute("errMsg", "帐号被锁定，请5分钟后再试"); - return ">>:" + Globals.AppDomain + "/platform/home/LockedAccountError"; + return ">>:" + "https://zhgh.hrbnu.edu.cn/platform/home/LockedAccountError"; } catch (UnknownAccountException e) { request.setAttribute("errMsg", "系统中没有此用户"); - return ">>:" + Globals.AppDomain + "/error/UnknownAccountError.html"; + return ">>:" + "https://zhgh.hrbnu.edu.cn/error/UnknownAccountError.html"; } catch (Exception e) { request.setAttribute("errMsg", "用户名或密码错误"); - return ">>:" + Globals.AppDomain + "/error/500.html"; + return ">>:" + "https://zhgh.hrbnu.edu.cn/error/500.html"; } } @@ -164,8 +166,8 @@ public class SysWechatController { System.out.println(state); int errCount = NumberUtils.toInt(Strings.sNull(SecurityUtils.getSubject().getSession(true).getAttribute("platformErrCount"))); try { - String decrypt = weChatUtils.decrypt(state); - loginUtil.doLogin(token, request, session, LoginUtil.LoginOrigin.WEI_XIN, decrypt); +// String decrypt = weChatUtils.decrypt(state); + loginUtil.doLogin(token, request, session, LoginUtil.LoginOrigin.WEI_XIN, state); return Result.success("login.success"); } catch (CaptchaIncorrectException e) { return Result.error(1, "login.error.captcha"); diff --git a/src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupListController.java b/src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupListController.java index e1cc2cc..6dc5631 100644 --- a/src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupListController.java +++ b/src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupListController.java @@ -86,7 +86,8 @@ public class HealthCheckupListController { @Param(value = "unitId", required = false) String unitId, @Param(value = "isChoose", required = false) Integer isChoose, @Param(value = "threeUnitId", required = false) String threeUnitId, - @Param(value = "unionGroupId", required = false) String unionGroupId) { + @Param(value = "unionGroupId", required = false) String unionGroupId, + @Param(value = "isHomeGo", required = false) String isHomeGo) { List confirms = dao.query(HealthCheckupUnionConfirm.class, Cnd.where("projectId", "=", projectId)); HealthCheckupProject project = healthCheckupProjectService.findOne(projectId); @@ -113,15 +114,22 @@ public class HealthCheckupListController { AND hcus.projectId = @projectId $condition """).setParam("projectId", projectId); - sql.setCondition(cnd); cnd.andEX("hcu.projectId", "=", projectId); cnd.andEX("hcu.unionId", "=", unionId); cnd.andEX("hcu.unitId", "=", unitId); cnd.andEX("hcu.unionGroupId", "=", unionGroupId); cnd.andEX("hcu.threeUnitId", "=", threeUnitId); - if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { - cnd.andEX("hcu.unionId", "=", Vi.getUnionId()); + if (StrUtil.isNotBlank(isHomeGo)) { + cnd.and("hcu.userId", "=", ShiroUtil.getUserId()); + } else { + if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { + if (!ShiroUtil.hasAnyRoles("H04,gh12")) { + cnd.and("hcu.userId", "=", ShiroUtil.getUserId()); + } else { + cnd.and("hcu.unionId", "=", Vi.getUnionId()); + } + } } switch (isChoose) { @@ -138,6 +146,7 @@ public class HealthCheckupListController { } else { cnd.asc("hcu.sort").desc("hcus.selectTime"); } + sql.setCondition(cnd); Pagination pagination = healthCheckupProjectService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); List paginationList = pagination.getList(); @@ -372,7 +381,7 @@ public class HealthCheckupListController { cnd.and(seg); } cnd.groupBy("hcu.userId"); - cnd.desc("hcus.selectTime").asc("hcu.unitId"); + cnd.asc("hcu.sort").desc("hcus.selectTime").asc("hcu.unitId"); List resultList = healthCheckupProjectService.listMap(sql); diff --git a/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java b/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java index 0b3b2e9..8403372 100644 --- a/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java @@ -37,6 +37,7 @@ public class HealthCheckupSingleServiceImpl extends ViServiceImpl - - - 输入身份证后自动匹配性别和年龄 + + + + + + + + + + + + + + + + + + + + -
-
职工信息：
-
- - - - - - -
-
-
-
所属工会：
-
- - - -
-
- -
-
所属单位：
-
- - - -
-
- -