From 3878c5a23f151bf3f317d836b5db64ed756adad5 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Tue, 27 Feb 2024 18:06:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/auth/controller/TokenController.java | 11 +++++++++-- .../com/bonus/sgzb/auth/service/SysLoginService.java | 6 +++--- .../sgzb/common/security/service/TokenService.java | 1 + .../material/service/impl/BackApplyServiceImpl.java | 9 +++++---- .../resources/mapper/material/BackApplyMapper.xml | 2 +- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java index 60768f8d..a76116b7 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java @@ -68,6 +68,7 @@ public class TokenController { /** * App端登录 + * * @param form * @return */ @@ -125,13 +126,19 @@ public class TokenController { public R register(@RequestBody RegisterBody registerBody) { // 用户注册 sysLoginService.register(registerBody); - return R.ok(null,"注册成功"); + return R.ok(null, "注册成功"); } @PostMapping("loginByMall") public R loginByMall(@RequestBody LoginUser loginUser) { // 用户注册 - return R.ok(sysLoginService.loginByMall(loginUser)); + Map map = sysLoginService.loginByMall(loginUser); + if ("1".equals(map.get("status").toString())) { + return R.fail("登录用户未注册"); + } else if ("2".equals(map.get("login_user").toString())) { + return R.fail("未携带token"); + } + return R.ok(map); } @ApiOperation("微服务平台认证接口") diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java index b4a3a374..bb6dc779 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java @@ -247,14 +247,14 @@ public class SysLoginService { // 表示商城登录该系统的标识 if (StringUtils.isNotBlank(token)) { R userInfo = remoteUserService.getUserInfo(username, SecurityConstants.INNER); - if (ObjectUtils.isNotEmpty(userInfo.getData())) { + if (ObjectUtils.isNotEmpty(userInfo.getData()) && userInfo.getCode() == 200) { return tokenService.createToken(userInfo.getData()); } else { - hashMap.put("login_user", "该用户未注册"); + hashMap.put("status", "1"); return hashMap; } } else { - hashMap.put("login_user", "token为空"); + hashMap.put("status", "2"); return hashMap; } } diff --git a/sgzb-common/sgzb-common-security/src/main/java/com/bonus/sgzb/common/security/service/TokenService.java b/sgzb-common/sgzb-common-security/src/main/java/com/bonus/sgzb/common/security/service/TokenService.java index e8479cde..cf7050bb 100644 --- a/sgzb-common/sgzb-common-security/src/main/java/com/bonus/sgzb/common/security/service/TokenService.java +++ b/sgzb-common/sgzb-common-security/src/main/java/com/bonus/sgzb/common/security/service/TokenService.java @@ -70,6 +70,7 @@ public class TokenService //密码置空后返回 loginUser.getSysUser().setPassword(""); rspMap.put("login_user", loginUser); + rspMap.put("status", "0"); return rspMap; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java index 75f2ddae..e6296f8e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java @@ -61,7 +61,7 @@ public class BackApplyServiceImpl implements BackApplyService { List backApplyListByAdmin = backApplyMapper.getBackApplyListByAdmin(bean); //机具分公司只能看到机具公司的退料 if (CollUtil.isNotEmpty(backApplyListByAdmin)) { - if (roles.contains("sgb") || roles.contains("jjfgs")) { + if (roles.contains("jjfgs")) { for (BackApplyInfo backApplyInfo : backApplyListByAdmin) { if (StringUtils.hasText(backApplyInfo.getCompanyId()) && backApplyInfo.getCompanyId().contains(String.valueOf(companyId))) { backApplyInfos.add(backApplyInfo); @@ -71,7 +71,7 @@ public class BackApplyServiceImpl implements BackApplyService { } //调试分公司只能看到调试公司的退料 if (CollUtil.isNotEmpty(backApplyListByAdmin)) { - if (roles.contains("ajb") || roles.contains("tsfgs")) { + if (roles.contains("tsfgs")) { for (BackApplyInfo backApplyInfo : backApplyListByAdmin) { if (StringUtils.hasText(backApplyInfo.getCompanyId()) && backApplyInfo.getCompanyId().contains(String.valueOf(companyId))) { backApplyInfos.add(backApplyInfo); @@ -162,6 +162,7 @@ public class BackApplyServiceImpl implements BackApplyService { public AjaxResult audit(BackApplyInfo bean) { Set roles = SecurityUtils.getLoginUser().getRoles(); String username = SecurityUtils.getLoginUser().getUsername(); + Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); int num = 0; if (!StringUtils.isEmpty(bean.getIds())) { String[] ids = bean.getIds().split(","); @@ -169,7 +170,7 @@ public class BackApplyServiceImpl implements BackApplyService { String id = ids[i]; bean.setId(Long.valueOf(id)); if (roles.contains("jjfgs") || roles.contains("admin")) { - bean.setCompanyId("101"); + bean.setCompanyId(companyId.toString()); bean.setCreateBy(username); bean.setStatus("1"); int re = backApplyMapper.audit(bean); @@ -178,7 +179,7 @@ public class BackApplyServiceImpl implements BackApplyService { } } if (roles.contains("tsfgs") || roles.contains("admin")) { - bean.setCompanyId("102"); + bean.setCompanyId(companyId.toString()); bean.setCreateBy(username); bean.setStatus("2"); int re = backApplyMapper.audit(bean); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml index 82c92ce4..878a16a5 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml @@ -253,7 +253,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" UPDATE tm_task tt LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id LEFT JOIN back_apply_details bad on bad.parent_id=bai.id - SET bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status=#{status},bai.direct_audit_time=NOW() + SET bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.status=#{status},bai.direct_audit_time=NOW() WHERE bai.id = #{id}