From 78224b56fbca867e049b2d39fb0f500a6a80b2e9 Mon Sep 17 00:00:00 2001
From: ljf <ljf@35325>
Date: Fri, 29 Mar 2024 16:10:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kms/config/scheduled/WaterScheduled.java   |  7 ++++++-
 .../system/CmsCallBackController.java          | 18 +++++++++++++++++-
 .../web/controller/tool/TestController.java    |  2 +-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/jwtech-admin/src/main/java/com/kms/config/scheduled/WaterScheduled.java b/jwtech-admin/src/main/java/com/kms/config/scheduled/WaterScheduled.java
index 669eabbd..3a9c5801 100644
--- a/jwtech-admin/src/main/java/com/kms/config/scheduled/WaterScheduled.java
+++ b/jwtech-admin/src/main/java/com/kms/config/scheduled/WaterScheduled.java
@@ -72,7 +72,6 @@ public class WaterScheduled {
                 user.setId(IdUtils.fastSimpleUUID());
                 user.setIsPcUser("0");
                 user.setDelFlag("0");
-                user.setUserType("00");
                 user.setMd5(MD5Util.MD5Encode(singleUser.toString(), "utf-8"));
             }else {
                 String md = MD5Util.MD5Encode(singleUser.toString(), "utf-8");
@@ -83,6 +82,12 @@ public class WaterScheduled {
             SingleOrg org = singleUser.getOrg();
             if(org!=null){
                 user.setDeptId(org.getId());
+                String type = org.getType();
+                if(type.equals("GA")){
+                    user.setUserType("00");
+                }else if(type.equals("SVA")){
+                    user.setUserType("01");
+                }
             }
             user.setPhonenumber(singleUser.getPhone());
             user.setNickName(singleUser.getName());
diff --git a/jwtech-admin/src/main/java/com/kms/web/controller/system/CmsCallBackController.java b/jwtech-admin/src/main/java/com/kms/web/controller/system/CmsCallBackController.java
index cfcdfea3..b21c7c3d 100644
--- a/jwtech-admin/src/main/java/com/kms/web/controller/system/CmsCallBackController.java
+++ b/jwtech-admin/src/main/java/com/kms/web/controller/system/CmsCallBackController.java
@@ -81,7 +81,7 @@ public class CmsCallBackController {
             user.setId(IdUtils.fastSimpleUUID());
             user.setIsPcUser("0");
             user.setDelFlag("0");
-            user.setUserType("04");
+
             user.setPhonenumber(singleUser.getPhone());
             user.setNickName(singleUser.getName());
             user.setUserName(singleUser.getUsername());
@@ -95,6 +95,16 @@ public class CmsCallBackController {
             }else {
                 user.setStatus("1");
             }
+            SingleOrg org = singleUser.getOrg();
+            if(org!=null){
+                user.setDeptId(org.getId());
+                String orgType = org.getType();
+                if(orgType.equals("GA")){
+                    user.setUserType("00");
+                }else if(orgType.equals("SVA")){
+                    user.setUserType("01");
+                }
+            }
             if(CollectionUtil.isNotEmpty(singleUser.getRoleList())) {
                 List<String> collect = singleUser.getRoleList().stream().map(singleRole -> singleRole.getId()).collect(Collectors.toList());
                 user.setRoleIds(collect.toArray(new String[collect.size()]));
@@ -111,6 +121,12 @@ public class CmsCallBackController {
             SingleOrg org = singleUser.getOrg();
             if(org!=null){
                 user.setDeptId(org.getId());
+                String orgType = org.getType();
+                if(orgType.equals("GA")){  //政务
+                    user.setUserType("00");
+                }else if(orgType.equals("SVA")){ //服务
+                    user.setUserType("01");
+                }
             }
             user.setPhonenumber(singleUser.getPhone());
             user.setNickName(singleUser.getName());
diff --git a/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java b/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java
index dfe5f80d..8250ea4f 100644
--- a/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java
+++ b/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java
@@ -51,7 +51,7 @@ public class TestController extends BaseController
 
     @GetMapping("test")
     public WaterResult test(){
-        WaterResult waterResult = waterRequestUtil.getUserResource("bearer 3a24f042-19e0-4885-8072-98f0fea641d9");
+        WaterResult waterResult = waterRequestUtil.getOrgPage();
         List<SingleMenu> singleMenus = JSONObject.parseArray(waterResult.getData(), SingleMenu.class);
         List<SingleMenu> singleAllMenus = new ArrayList<>();
         setChildren(singleMenus,singleAllMenus);