中控同步修改

src/main/java/com/usky/dxtop/service/job/CenterUserJob.java

@@ -146,8 +146,10 @@ public class CenterUserJob {
 
         //获取部门信息
         Map deptMap = JSON.parseObject(staff.getDept(), Map.class);
-        SysDept sysDept = depts.stream().filter(dept -> dept.getCenterDeptId().equals(deptMap.get("id").toString())).findAny().get();
-        sysUser.setDeptId(sysDept.getDeptId());
+        if (null != deptMap && null != deptMap.get("id")){
+            depts.stream().filter(dept -> deptMap.get("id").toString().equals(dept.getCenterDeptId())).findAny()
+                    .ifPresent(s -> sysUser.setDeptId(s.getDeptId()));
+        }
         return sysUser;
     }
 

src/test/java/com/usky/dxtop/SmApiTest.java

@@ -1,12 +1,12 @@
 package com.usky.dxtop;
 
+import com.usky.dxtop.common.utils.SecurityUtils;
 import com.usky.dxtop.common.utils.http.HttpUtils;
 import com.usky.dxtop.model.Dept;
 import com.usky.dxtop.service.DeptService;
 import com.usky.dxtop.service.api.WxApi;
 import com.usky.dxtop.service.job.CenterUserJob;
 import com.usky.dxtop.service.job.SmJob;
-import com.usky.dxtop.service.util.CenterDecryptUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -98,20 +98,22 @@ public class SmApiTest {
 
 
         SmJob.PersonParam personParam = new SmJob.PersonParam();
-        personParam.setBlurry("admin");
-        smJob.personApi(personParam);
+        personParam.setBlurry("李超");
+        centerUserJob.personApi(personParam);
+    }
+
+
+    @Test
+    public void test8(){
+        smJob.groupApi(null);
     }
 
 
 
     @Test
     public void test7(){
-        try {
-            String pwd = CenterDecryptUtil.decryptByPrivateKey(CenterDecryptUtil.KEY,"");
-            System.out.println(pwd);
-        }catch (Exception e){
-
-        }
+        System.out.println(SecurityUtils.encryptPassword("adb"));
+        System.out.println(SecurityUtils.encryptPassword("ABC"));
     }