From c46575f8d2fbeb3e1d8a270c1e8d335a91ac5e18 Mon Sep 17 00:00:00 2001 From: 1178634255 <1178634255@qq.com> Date: Fri, 7 Jul 2023 18:43:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java | 1 + src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java b/src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java index d3f46a12..55a5a7c0 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java @@ -11,6 +11,7 @@ import java.util.List; public class FilterAuthUserRequest extends ListPageRequest { private String userName; + private String deptName; private Integer userFlag; diff --git a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index cb73d38b..781c5f64 100644 --- a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -21,6 +21,9 @@ AND userName LIKE CONCAT('%', #{userName}, '%') + + AND auth_dept.name LIKE CONCAT('%', #{deptName}, '%') + AND userName != #{neUserName} From fcaabc888ab6a173a410b9d8a319dc732c43a5fe Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sun, 9 Jul 2023 09:17:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/sync/SpsSyncDownloadController.java | 4 ++-- .../api/service/inout/impl/IoOrderServiceImpl.java | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index e0d6ffca..898c5880 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -751,8 +751,8 @@ public class SpsSyncDownloadController { } } else { // 更新业务详情 - if (orderEntity.getCheckStatus() != null) - orderService.update(orderEntity); +// if (orderEntity.getCheckStatus() != null) +// orderService.update(orderEntity); //更新业务详情 if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailBizEntities())) { List orderDetailBizEntities = syncDataResponse.getOrderDetailBizEntities(); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 9a7e0b32..b4bd9bf4 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -585,8 +585,14 @@ public class IoOrderServiceImpl implements IoOrderService { IoOrderResponse response = new IoOrderResponse(); BeanUtil.copyProperties(orderEntity, response); if (orderEntity.getStatus().equals(ConstantStatus.ORDER_STATUS_AUDITED) && checkBusTypeSupplementOrder(orderEntity) - && StrUtil.isEmpty(orderEntity.getSupplementNo())) { - response.setEnableSupplementOrder(true); + && StrUtil.isEmpty(orderEntity.getSupplementNo()) + ) { + if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP) { + if (orderEntity.getOutChangeEnable()) { + response.setEnableSupplementOrder(true); + } + } else + response.setEnableSupplementOrder(true); } result.add(response); } catch (Exception e) { From fd89a744c531d2411cf249c4d638bc21cfdd622f Mon Sep 17 00:00:00 2001 From: 1178634255 <1178634255@qq.com> Date: Mon, 10 Jul 2023 09:13:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/auth/AuthUserController.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java index 87d725e2..4f5fc287 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java @@ -12,6 +12,7 @@ import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.service.auth.*; +import com.glxp.api.util.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -130,6 +131,12 @@ public class AuthUserController extends BaseController { public BaseResponse updateUser(@RequestBody UpdateUserRequset updateUserRequset) { AuthAdmin authAdmin=customerService.getUserBean(); System.out.println(updateUserRequset.toString()); + if (StringUtils.isBlank(updateUserRequset.getNewPassword())){ + return ResultVOUtils.error(500,"请输入新密码！"); + } + if (StringUtils.isBlank(updateUserRequset.getConfirmPassword())){ + return ResultVOUtils.error(500,"请输入确认密码！"); + } if (!updateUserRequset.getPassWord().equals(authAdmin.getPassWord())){ return ResultVOUtils.error(500,"当前密码输入错误！请重新输入！"); }