From a1ed3e45c9a9c0afdf69c03e78ada81cb3f0afa8 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Wed, 13 Jul 2022 09:20:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BC=98=E5=8C=962?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/service/GradeService.java    |  2 ++
 .../service/impl/GradeServiceImpl.java        |  9 +++++++++
 .../organization/web/GradeController.java     | 19 +++++++++++++++----
 .../organization/wrapper/GradeWrapper.java    |  5 +++++
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/com/engine/organization/service/GradeService.java b/src/com/engine/organization/service/GradeService.java
index 93a63251..46a59c2c 100644
--- a/src/com/engine/organization/service/GradeService.java
+++ b/src/com/engine/organization/service/GradeService.java
@@ -78,4 +78,6 @@ public interface GradeService {
      */
     Map<String, Object> getTabInfo();
 
+
+    String getLevelId(Long id);
 }
diff --git a/src/com/engine/organization/service/impl/GradeServiceImpl.java b/src/com/engine/organization/service/impl/GradeServiceImpl.java
index 8b1e6bbc..c07349ed 100644
--- a/src/com/engine/organization/service/impl/GradeServiceImpl.java
+++ b/src/com/engine/organization/service/impl/GradeServiceImpl.java
@@ -161,15 +161,19 @@ public class GradeServiceImpl extends Service implements GradeService {
             Map<String, Object> completeParams = levelBrowserBean.getCompleteParams();
             completeParams.put("currenttime", l);
             completeParams.put("scheme_id_"+ l,gradePO.getSchemeId());
+            completeParams.put("level_id_"+ l,"''");
             Map<String, Object> conditionDataParams = levelBrowserBean.getConditionDataParams();
             conditionDataParams.put("currenttime", l);
             conditionDataParams.put("scheme_id_"+ l,gradePO.getSchemeId());
+            conditionDataParams.put("level_id_"+ l,"''");
             Map<String, Object> dataParams = levelBrowserBean.getDataParams();
             dataParams.put("currenttime", l);
             dataParams.put("scheme_id_"+ l,gradePO.getSchemeId());
+            dataParams.put("level_id_"+ l,"''");
             Map<String, Object> destDataParams = levelBrowserBean.getDestDataParams();
             destDataParams.put("currenttime", l);
             destDataParams.put("scheme_id_"+ l,gradePO.getSchemeId());
+            destDataParams.put("level_id_"+ l,"''");
 
             levelBrowserItem.setBrowserConditionParam(levelBrowserBean);
 
@@ -212,6 +216,11 @@ public class GradeServiceImpl extends Service implements GradeService {
         return apiDatas;
     }
 
+    @Override
+    public String getLevelId(Long id) {
+        return MapperProxyFactory.getProxy(GradeMapper.class).getGradeByID(id).getLevelId();
+    }
+
     /**
      * 查询条件
      *
diff --git a/src/com/engine/organization/web/GradeController.java b/src/com/engine/organization/web/GradeController.java
index f0a7f34b..47cd7191 100644
--- a/src/com/engine/organization/web/GradeController.java
+++ b/src/com/engine/organization/web/GradeController.java
@@ -12,10 +12,7 @@ import weaver.hrm.User;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
+import javax.ws.rs.*;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import java.util.Map;
@@ -205,4 +202,18 @@ public class GradeController {
            return ReturnResult.exceptionHandle(e);
         }
     }
+
+    @GET
+    @Path("/getLevelId")
+    @Produces(MediaType.APPLICATION_JSON)
+    public ReturnResult getLevelId(@Context HttpServletRequest request, @Context HttpServletResponse response,
+                                   @QueryParam("id")Long id) {
+        try {
+            User user = HrmUserVarify.getUser(request, response);
+            return ReturnResult.successed(getGradeWrapper(user).getLevelId(id));
+        } catch (Exception e) {
+            return ReturnResult.exceptionHandle(e);
+        }
+    }
+
 }
diff --git a/src/com/engine/organization/wrapper/GradeWrapper.java b/src/com/engine/organization/wrapper/GradeWrapper.java
index 0cf8583b..2c0e5735 100644
--- a/src/com/engine/organization/wrapper/GradeWrapper.java
+++ b/src/com/engine/organization/wrapper/GradeWrapper.java
@@ -144,4 +144,9 @@ public class GradeWrapper extends OrganizationWrapper {
     public Map<String, Object> getTabInfo() {
         return getGradeService(user).getTabInfo();
     }
+
+
+    public String getLevelId(Long id) {
+        return getGradeService(user).getLevelId(id);
+    }
 }

From 01ea1e8899138e5ed964b3bd6616e847de9aca3f Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Wed, 13 Jul 2022 10:22:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=81=8C=E5=8A=A1sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/初始数据SQL/职务类型默认.sql | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 docs/初始数据SQL/职务类型默认.sql

diff --git a/docs/初始数据SQL/职务类型默认.sql b/docs/初始数据SQL/职务类型默认.sql
new file mode 100644
index 00000000..359bdda9
--- /dev/null
+++ b/docs/初始数据SQL/职务类型默认.sql
@@ -0,0 +1,9 @@
+INSERT INTO `hrmjobgroups`
+( `JOBGROUPNAME`, `JOBGROUPREMARK`, `created`, `creater`, `modified`, `modifier`, `uuid` )
+VALUES
+	( '聚才林', '聚才林', DATE( NOW()), 1, NULL, NULL, 'd9f435c3-8d4d-4e01-9a97-d72f9c5d5fae' );
+
+INSERT INTO `hrmjobactivities`
+(  `JOBACTIVITYMARK`, `JOBACTIVITYNAME`, `JOBGROUPID`, `JOBLEVELFROM`, `JOBLEVELTO`, `created`, `creater`, `modified`, `modifier`, `uuid` )
+VALUES
+	( '默认职务', '默认职务', 14, NULL, NULL, DATE( NOW()), 1, NULL, NULL, '3a2efce3-95de-4ec2-afe1-347783817bdb' );
\ No newline at end of file