修改用户登录记录bug

fbs_code/fbs-backend/fbs-sys-service/src/main/java/com/yyjc/fbs/sys/controller/SysDictionaryController.java

@@ -194,7 +194,8 @@ public class SysDictionaryController {
 		return resp;
 	}
 
-	@VerifySecurity
+	//@VerifySecurity
+	@AuthSecurity
 	@ApiOperation(value = "左侧下级机构以及企业树形结构-包含自身节点", consumes = "application/json")
 	@RequestMapping(value = "/getOrgCompanyTree", method = RequestMethod.GET)
 	public ResponseVO<List<CascadeNode>> getOrgCompanyTree(

fbs_code/fbs-backend/fbs-sys-service/src/main/java/com/yyjc/fbs/sys/controller/UserLoginLogsController.java

@@ -69,7 +69,7 @@ public class UserLoginLogsController {
 				params.setOrg_ids(org_ids);
 			}
 		} else {
-			if (req.getParams().getType() == TreeTypeEnum.COMPANY.getType()) {
+			if (req.getParams().getType()!=null&&req.getParams().getType() == TreeTypeEnum.COMPANY.getType()) {
 				params.setCompany_id(req.getParams().getId());
 			} else {
 				List<Integer> org_ids = iOrganizationalBiz.selectOrgList(req.getParams().getId());

fbs_code/fbs-backend/fbs-sys-service/src/main/java/com/yyjc/fbs/sys/dao/provider/UserLoginLogsProvider.java

@@ -56,7 +56,7 @@ public class UserLoginLogsProvider {
 						WHERE("org_id in (" + sql + ")");
 					}
 				}
-				GROUP_BY("login_name");
+				GROUP_BY("login_name,org_id,company_id");
 				ORDER_BY("login_num DESC");
 			}
 		}.toString();

fbs_code/fbs-backend/fbs-sys-service/src/main/resources/config/application-dev.yml

@@ -2,8 +2,8 @@ app:
   id: cems-sys
 apollo:
   #meta: http://192.168.0.103:8080
-  #meta: http://127.0.0.1:8180
-  meta: http://192.168.0.81:8180
+  meta: http://127.0.0.1:8180
+  #meta: http://192.168.0.81:8180
   bootstrap:
     enabled: true
     namespaces: ${namespace}