From 79810458e869450fcdfa96b92f79e5c78cb46c04 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Thu, 30 Jul 2020 16:37:55 +0800
Subject: [PATCH] 去掉 组织新增的按钮,修改添加医院的bug,添加Python 获取加密码的接口

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysOrganizationServiceImpl.java |   35 ++++++++++++++++++++++++-----------
 1 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysOrganizationServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysOrganizationServiceImpl.java
index b47160b..d3795a3 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysOrganizationServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysOrganizationServiceImpl.java
@@ -225,25 +225,38 @@
             //查询
             QueryWrapper queryWrapper = new QueryWrapper();
             queryWrapper.eq("org_parent_id", sysOrg.getId());
-            queryWrapper.orderByAsc("id");
+            queryWrapper.orderByDesc("org_code");
+            queryWrapper.last("limit 1");
             List<SysOrganization> list = baseMapper.selectList(queryWrapper);
             if (list.size() > 0) {
                 SysOrganization sysOrganizationLast = list.get(list.size() - 1);
-                String orgCodeLast = sysOrganizationLast.getOrgCode();
-                String orgCodeLastQianZhui = orgCodeLast.substring(0, orgCodeLast.length() - 4);
-                Integer codenum = Integer.valueOf(orgCodeLast.substring(orgCodeLast.length() - 4));
-                String str = "0000";
-                str += (codenum + 1);
-                String substring = str.substring(str.length() - 4);
-                return orgCodeLastQianZhui + substring;
+                if(sysOrganizationLast.getOrgLevel()>=2){
+                    String orgCodeLast = sysOrganizationLast.getOrgCode();
+                    //取前部分
+                    String orgCodeLastQianZhui = orgCodeLast.substring(0, orgCodeLast.length() - 3);
+                    //取后部分
+                    Integer codenum = Integer.valueOf(orgCodeLast.substring(orgCodeLast.length() - 3));
+                    String str = "00";
+                    str += (codenum + 1);
+                    String substring = str.substring(str.length() - 3);
+                    return orgCodeLastQianZhui + substring;
+                }else {
+                    String orgCodeLast = sysOrganizationLast.getOrgCode();
+                    //取前部分
+                    String orgCodeLastQianZhui = orgCodeLast.substring(0, orgCodeLast.length() - 7);
+                    //取后部分
+                    Integer codenum = Integer.valueOf(orgCodeLast.substring(orgCodeLast.length() - 7));
+                    String str = "0000000";
+                    str += (codenum + 1);
+                    String substring = str.substring(str.length() - 7);
+                    return orgCodeLastQianZhui + substring;
+                }
             } else {
                 String fucode = sysOrg.getOrgCode();
-                String str = "0001";
+                String str = "01";
                 return fucode + str;
             }
-
         }
         return null;
     }
-
 }

--
Gitblit v1.8.0