修改假期同步

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java

@@ -97,15 +97,16 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
         JSONObject jsonObject = new JSONObject();
         Map<String, Object> model = new HashMap<>();
         String busiDesc = this.getModuleDesc() + "构建站点树";
+        Context context = getContext();
         try {
-            List<SiteTreeSelect> siteTree = this.service.getSiteTree(getContext());
+            List<SiteTreeSelect> siteTree = this.service.getSiteTree(context);
             if (ObjectUtils.isEmpty(siteTree)) {
                 log.info("为初始化站点树，重新构建！");
-                siteTree = this.service.siteTree(getContext());
+                siteTree = this.service.siteTree(context);
             }
             model.put("siteTree", siteTree);
-            this.init(model, getContext());
-            if (!ObjectUtils.isEmpty(getContext()) && !ObjectUtils.isEmpty(getContext().getUser())) {
+            this.init(model, context);
+            if (!ObjectUtils.isEmpty(context) && !ObjectUtils.isEmpty(context.getUser())) {
                 recordSysLog(request, busiDesc + " 【成功】");
             }
             jsonObject.put(KEY_RESULT_DATA, model);

base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http

@@ -65,7 +65,7 @@ Accept: application/json
 ###构建站点树
 GET {{baseUrl}}/site/siteTree
 #Authorization: {{authToken}}
-Authorization: eyJhbGciOiJIUzI1NiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE6NTgyNzRlMWM1MDlhNDQ2YzhmYjVlMDRkNjNlM2JmOTAifQ.dLq6-GLVOPvxq66pbqpj0K5qx1y3FzbKzbKq-wCxOr4
+Authorization: eyJhbGciOiJIUzI1NiJ9.eyJsb2dpbl91c2VyX2tleSI6IjIwNjY6ZThiZjhiZjU4ZTZmNGU5OGI0OTI2NDdhYjNmMGUyN2UifQ.qg66SOWLIgYoIzQKmTczhqgL-8SMBqEmY1UUCd0nN4A
 Accept: application/json
 
 

base-manager/src/test/java/com/mortals/httpclient/system/system.http

@@ -4,8 +4,8 @@ POST {{baseUrl}}/login/login
 Content-Type: application/json
 
 {
-  "loginName":"admin",
-  "password":"admin",
+  "loginName":"banana",
+  "password":"gxjG123!@#",
   "securityCode":"8888"
 }