From e4d37c8501c36284ab72488db2aab20fa2b2b59d Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Wed, 9 Jul 2025 09:12:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=BA=E5=91=98=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=E6=8E=A5=E5=8F=A3,=E7=A6=BB=E8=81=8C=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E5=88=A4=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hxgk/lowcode/controller/ManContController.java | 13 +++++++++---- src/main/resources/application-dev.yml | 2 +- src/main/resources/application-prod.yml | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/hxgk/lowcode/controller/ManContController.java b/src/main/java/com/hxgk/lowcode/controller/ManContController.java index d9f7bd8..5ab77cc 100644 --- a/src/main/java/com/hxgk/lowcode/controller/ManContController.java +++ b/src/main/java/com/hxgk/lowcode/controller/ManContController.java @@ -31,11 +31,16 @@ public class ManContController { if(!StringUtils.isBlank(paramValue)){ ManCont manCont = userService.getManContByDeviceNo(paramType,paramValue); if(null!=manCont){ + if(null!=manCont.getEmpType() && manCont.getEmpType()<9){ + //查出该员工的所有父级部门 + List parentOrgs = userService.getAllParentOrgForEmp(manCont); + return JsonData.buildSuccess(parentOrgs); + //return JsonData.buildError("当前deviceNo没有绑定员工,可以xxl-job手动同步一下试试"); + }else{ + return JsonData.buildError("当前deviceNo绑定的员工不在职"); + } + - //查出该员工的所有父级部门 - List parentOrgs = userService.getAllParentOrgForEmp(manCont); - return JsonData.buildSuccess(parentOrgs); - //return JsonData.buildError("当前deviceNo没有绑定员工,可以xxl-job手动同步一下试试"); }else{ return JsonData.buildError("当前deviceNo没有绑定员工,可以xxl-job手动同步一下试试"); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 4e82e2b..55a90df 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -2,7 +2,7 @@ mybatis: configuration: #开启控制台打印sql - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # mybatis 下划线转驼峰配置,两者都可以 map-underscore-to-camel-case: true #配置扫描 diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index be0a30d..a143eec 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -2,7 +2,7 @@ mybatis: configuration: #开启控制台打印sql - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # mybatis 下划线转驼峰配置,两者都可以 map-underscore-to-camel-case: true #配置扫描