From 7fd92c17959465c4daa1a7068e6241f0dac4cf0c Mon Sep 17 00:00:00 2001
From: zth <1205836521@qq.com>
Date: Thu, 6 Jun 2024 15:41:26 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/kms/config/scheduled/WaterScheduled.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 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 0fffdc84..3ba85cb0 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
@@ -1,6 +1,7 @@
 package com.kms.config.scheduled;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -86,15 +87,16 @@ public class WaterScheduled {
                 user.setMd5(MD5Util.MD5Encode(singleUser.toString(), "utf-8"));
             }else {
                 String md = MD5Util.MD5Encode(singleUser.toString(), "utf-8");
-                if(user.getMd5()!=null&&md.equals(user.getMd5())){
-                    continue;
-                }
+//                if(user.getMd5()!=null&&md.equals(user.getMd5())){
+//                    continue;
+//                }
 
             }
             SingleOrg org = singleUser.getOrg();
             List<String> collect = singleUser.getRoleList().stream().map(singleRole -> singleRole.getId()).collect(Collectors.toList());
             List<SysRole> roles = roleService.listByIds(collect);
             if(org!=null){
+              
                 user.setDeptId(org.getId());
                 String type = singleUser.getType();
                 if(type.equals("GA")){ //政务机构
@@ -121,7 +123,7 @@ public class WaterScheduled {
                             collect.add(YW00110);
                         }
                     }
-                }else if(type.equals("SVC")||type.equals("ORG")){  //服务机构
+                }else if(type.equals("SVC")||type.equals("ORG")||type.equals("LP")){  //服务机构
                     user.setUserType("01");
                     if(CollectionUtil.isEmpty(roles)){
                         collect.add(YW00112);