diff --git a/pom.xml b/pom.xml index d153acd..500674f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.hxgk lowcode 0.0.1-SNAPSHOT - war + jar lowcode Demo project for Spring Boot @@ -13,6 +13,7 @@ UTF-8 UTF-8 2.7.6 + @@ -156,7 +157,7 @@ ${spring-boot.version} com.hxgk.lowcode.LowcodeApplication - true + diff --git a/src/main/java/com/hxgk/lowcode/service/impl/HrServiceImpl.java b/src/main/java/com/hxgk/lowcode/service/impl/HrServiceImpl.java index 26c6093..ae2e526 100644 --- a/src/main/java/com/hxgk/lowcode/service/impl/HrServiceImpl.java +++ b/src/main/java/com/hxgk/lowcode/service/impl/HrServiceImpl.java @@ -100,15 +100,15 @@ public class HrServiceImpl implements HrService { public Tree getOrgAndManTree() { //先从redis里查一下看看有没有有则直接返回 - if(redisTemplate.hasKey("orgTree_309_102")){ - String orgTreeStr = redisTemplate.opsForValue().get("orgTree_309_102").toString(); + if(redisTemplate.hasKey("orgTree_0_313")){ + String orgTreeStr = redisTemplate.opsForValue().get("orgTree_0_313").toString(); Tree o = JSON.parseObject(orgTreeStr, Tree.class); return o; }else{ ArrayList allWsList = new ArrayList(); ArrayList treeList = new ArrayList(); - - Long adminorg = 309L;//高科企管部 + Long adminorg = 0L;//恒信集团 + //Long adminorg = 309L;//高科企管部 //Long adminorg = 312L;//高科 OrgContType orgContType = queryOrgContTypeByAdminorg(adminorg); @@ -139,12 +139,12 @@ public class HrServiceImpl implements HrService { recursionListToTree(treeList,pid); } for (Tree dept : treeList) { - if(dept.getId().equals("102")){//309高科 102企管 + if(dept.getId().equals("313")){//309高科 102企管 313集团 tree = dept; } } String orgAndManTree_Json= JSON.toJSONString(tree); - redisTemplate.opsForValue().set("orgTree_309_102", orgAndManTree_Json, 1, TimeUnit.DAYS); + redisTemplate.opsForValue().set("orgTree_0_313", orgAndManTree_Json, 1, TimeUnit.DAYS); return tree; } @@ -197,6 +197,17 @@ public class HrServiceImpl implements HrService { */ public OrgContType queryOrgContTypeByAdminorg(Long adminorg) { + if(adminorg==0){ + OrgContType orgContType = new OrgContType(); + orgContType.setId(0L); + orgContType.setLevel(0); + orgContType.setName("root"); + orgContType.setNumbe("rootnumbe"); + orgContType.setState((byte) 1); + orgContType.setTypename("根"); + orgContType.setSuperior(9999999l); + return orgContType; + } OrgContType orgContType = orgContTypeMapper.queryLever(adminorg); return orgContType; } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index ab204c1..69c77e0 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -16,12 +16,6 @@ spring: datasource: dynamic: datasource: - hengxingaoketes: - driver-class-name: com.mysql.cj.jdbc.Driver - password: rjwi58B6zYCHMbGZ - #url: jdbc:mysql://127.0.0.1:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false - url: jdbc:mysql://172.20.2.87:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false - username: hengxingaoke_tes hrnew: driver-class-name: com.mysql.cj.jdbc.Driver password: 9z_Bu28r1*DZ3K6@+a