From 1ceabefb451912daa5dda7768b7ef0b89a56c08a Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 25 Mar 2022 12:28:00 +0800 Subject: [PATCH] 1 --- zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java index f2ab628..1e8fb3b 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java +++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java @@ -59,6 +59,9 @@ @RestController @RequestMapping(value = "/api/common") public class ApiCommonAction { + @Autowired + UploadUtil uploadUtil; + @Autowired private SysUsersService sysUsersService; @@ -169,11 +172,12 @@ EXT_LIST.add(FileType.PNG); } + @ApiOperation(value = "表单图片上传接口", notes = "表单图片上传接口") @PostMapping(value = "/uploadImg") public AjaxResult uploadImg(HttpServletResponse response, MultipartHttpServletRequest request) throws IOException, FileUploadException, NoSuchAlgorithmException { - Map<String, String> fileMap = UploadUtil.doUpload(request, EXT_LIST, folderType, 1L); + Map<String, String> fileMap = uploadUtil.doUpload(request, EXT_LIST, folderType, 1L); AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("上传成功"); ajaxResult.putInMap("file", fileMap.get("visitPath")); return ajaxResult; @@ -293,7 +297,7 @@ return AjaxResult.buildFailInstance("code不存在"); } AjaxResult res = new AjaxResult(); - String requrl = weChatApiTools.getXcxLoginUrl(code, HostInterceptor.getCompanyId(), AppConstance.MINI_PROGRAM_MANAGER_APP_ID); + String requrl = weChatApiTools.getManagerXcxLoginUrl(code); String resultData = HttpCurlUtil.sendGetHttp(requrl, null); JSONObject json = JSONObject.fromObject(resultData); @@ -321,6 +325,12 @@ authorityManager.initUserPower(res, hasBind); UserInfoVo userInfoVo = new UserInfoVo(); + if(hasBind.getShopId()!=null){ + SysShopInfo shopInfo = sysShopInfoService.findById(hasBind.getShopId()); + hasBind.setShopName(shopInfo.getShopName()); + userInfoVo.setShopName(shopInfo.getShopShortName()); + } + userInfoVo.setId(hasBind.getSuId()); userInfoVo.setName(hasBind.getSuName()); userInfoVo.setRoleName(hasBind.getRoleName()); @@ -347,6 +357,12 @@ authorityManager.initUserPower(result, user); UserInfoVo userInfoVo = new UserInfoVo(); + if(user.getShopId()!=null){ + SysShopInfo shopInfo = sysShopInfoService.findById(user.getShopId()); + user.setShopName(shopInfo.getShopName()); + userInfoVo.setShopName(shopInfo.getShopShortName()); + } + userInfoVo.setId(user.getSuId()); userInfoVo.setName(user.getSuName()); userInfoVo.setRoleName(user.getRoleName()); @@ -362,8 +378,7 @@ List<String> openIds = StrUtil.split(hasBind.getOpenIds(), ','); openIds.remove(loginDto.getOpenId()); - hasBind.setOpenIds(CollUtil.join(openIds, ",")); - sysUsersService.modifyByModel(hasBind); + sysUsersService.modifyUserOpenId(CollUtil.join(openIds, ","), hasBind.getSuId()); } } -- Gitblit v1.9.1