From 0b340003f38282d285be5fd62b0b4ee2ad3fb772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Wed, 5 Mar 2025 23:45:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProProjectInfoSubdeptsUsersServiceImpl.java | 8 +++----- yanzhu-ui-app/miniprogram/config.js | 8 ++++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java index 7d68c54d..ab3922b1 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java @@ -1,6 +1,7 @@ package com.yanzhu.manage.service.impl; import cn.binarywang.wx.miniapp.api.WxMaService; +import com.alibaba.fastjson.JSON; import com.yanzhu.common.core.constant.SecurityConstants; import com.yanzhu.common.core.enums.*; import com.yanzhu.common.core.exception.ServiceException; @@ -394,7 +395,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu proSubdeptsGroup.setSubDeptName(proProjectInfoSubdeptsUsers.getSubDeptName()); proSubdeptsGroup.setSubDeptType(proProjectInfoSubdeptsUsers.getSubDeptType()); int count = proSubdeptsGroupList.size()+1; - String pre = Objects.equals(proProjectInfoSubdeptsUsers.getCraftType(), CraftTypeEnums.PYGZ.getCode())?"普通":"特殊"; + String pre = "普通"; String craftPostName = DictUtils.getDictLabel("pro_craft_post",proProjectInfoSubdeptsUsers.getCraftPost()); proSubdeptsGroup.setGroupName(pre+craftPostName+"班组"+count); proSubdeptsGroup.setCraftType(proProjectInfoSubdeptsUsers.getCraftType()); @@ -472,9 +473,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu sysUser.setUpdateBy(SecurityUtils.getUsername()); sysUser.setUpdateTime(DateUtils.getNowDate()); sysUser.setRemark(proProjectInfoSubdeptsUsers.getSubDeptName()); - log.info("insertProProjectInfoSubdeptsUsersWX==>{}",sysUser.getUserName()); Long userId = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER).getData(); - log.info("insertProProjectInfoSubdeptsUsersWX==>{}",userId); proProjectInfoSubdeptsUsers.setUserId(userId); proProjectInfoSubdeptsUsersMapper.insertProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); return proProjectInfoSubdeptsUsers; @@ -615,7 +614,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu proProjectInfoSubdeptsMapper.updatePhone(entity.getUserPhone(),proProjectInfoSubdeptsUsers.getUserPhone()); proProjectInfoSubdeptsGroupMapper.updatePhone(entity.getUserPhone(),proProjectInfoSubdeptsUsers.getUserPhone()); proProjectInfoSubdeptsUsersMapper.updatePhone(entity.getUserPhone(),proProjectInfoSubdeptsUsers.getUserPhone()); - proProjectInfoSubdeptsUsersMapper.updatePhone(entity.getUserPhone(),proProjectInfoSubdeptsUsers.getUserPhone()); + proProjectInfoSubdeptsUsersMapper.updateUserPhone(entity.getUserPhone(),proProjectInfoSubdeptsUsers.getUserPhone()); } /**updateUserPhone @@ -628,7 +627,6 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu @Transactional public ProProjectInfoSubdeptsUsers updateProProjectInfoSubdeptsUsersWX(ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers) { - log.info("updateProProjectInfoSubdeptsUsersWX==>"); ProProjectInfoSubdeptsUsers parUsers = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(proProjectInfoSubdeptsUsers.getParId()); if(Objects.isNull(parUsers)){ throw new ServiceException("用户信息异常...请重新扫码"); diff --git a/yanzhu-ui-app/miniprogram/config.js b/yanzhu-ui-app/miniprogram/config.js index 7e94b0e0..bc78aeeb 100644 --- a/yanzhu-ui-app/miniprogram/config.js +++ b/yanzhu-ui-app/miniprogram/config.js @@ -2,10 +2,10 @@ module.exports = { timeout: 60000, appId: "wx46466c7828eede2b", - //baseUrl: 'https://xiangguan.sxyanzhu.com', - baseUrl: 'http://127.0.0.1:8080', - //baseImgUrl: 'https://xiangguan.sxyanzhu.com', + baseUrl: 'https://xiangguan.sxyanzhu.com', + //baseUrl: 'http://127.0.0.1:8080', + baseImgUrl: 'https://xiangguan.sxyanzhu.com', //baseImgUrl: 'https:xiangguan.sxyanzhu.com/file', - baseImgUrl: 'http://127.0.0.1:9300', + //baseImgUrl: 'http://127.0.0.1:9300', noSecuritys:['/code','/auth/wxLogin','/auth/getMaOpenId','/auth/getMaPhoneNumber','/auth/maLogin'] }; \ No newline at end of file