fix:88297

laws-module-system/src/main/java/com/jero/modules/system/entity/OauthUserInfo.java

@@ -15,6 +15,13 @@ import java.util.List;
 public class OauthUserInfo {
     /** -----------正确响应返回结果----------- */
 
+
+    /**
+     * 对应登录的工号
+     */
+    @ApiModelProperty(value = "对应登录的工号")
+    private String employeeNumber;
+
     /**
      * 邮箱
      */

laws-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java

@@ -219,7 +219,7 @@ public class LoginServiceImpl implements ILoginService {
         }
 
         // 获取用户信息
-        String userName = oauthUserInfo.getLoginName();
+        String userName = oauthUserInfo.getEmployeeNumber();
         SysUser sysUser = sysUserService.getUserByName(userName);
 
         // 校验用户是否有效

laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java

@@ -1538,6 +1538,12 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
         while (startIndex < listIds.size()) {
             int endIndex = getEndIndex(startIndex, batchCount, listIds);
             List<String> listIdsSub = listIds.subList(startIndex, endIndex);
+            if (Objects.equals(opType, LawsHomeSearchCommon.LAWS_ES_DELETE)) {
+                for (String s : listIdsSub) {
+                    jeroElasticsearchTemplate.delete(HomeSearchEnum.INDEX_NAME_DOCUMENT_ZQ.getValue(), HomeSearchEnum.TYPE_NAME_DOCUMENT_ZQ.getValue(), s);
+                }
+                break;
+            }
             List<LawsDomesticStandard> listLawsDomesticStandard = lawsDomesticStandardService.listByIds(listIdsSub);
             if(CollectionUtils.isEmpty(listLawsDomesticStandard)){
                 break;
@@ -1701,6 +1707,12 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
         while (startIndex < listIds.size()) {
             int endIndex = getEndIndex(startIndex, batchCount, listIds);
             List<String> listIdsSub = listIds.subList(startIndex, endIndex);
+            if (Objects.equals(opType, LawsHomeSearchCommon.LAWS_ES_DELETE)) {
+                for (String s : listIdsSub) {
+                    jeroElasticsearchTemplate.delete(HomeSearchEnum.INDEX_NAME_DOCUMENT_ZQ.getValue(), HomeSearchEnum.TYPE_NAME_DOCUMENT_ZQ.getValue(), s);
+                }
+                break;
+            }
             List<LawsEnterpriseStandard> listLawsEnterpriseStandard = lawsEnterpriseStandardService.listByIds(listIdsSub);
             if(CollectionUtils.isEmpty(listLawsEnterpriseStandard)){
                 break;