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 #配置扫描