fix：导购查询修改

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/role/HaobanRoleApiService.java

@@ -25,7 +25,7 @@ public interface HaobanRoleApiService {
 
 
     /**
-     * 编辑
+     * 好办编辑
      *
      * @param haobanRoleQDTO
      * @return {@link ServiceResponse }
@@ -34,6 +34,15 @@ public interface HaobanRoleApiService {
      */
     ServiceResponse edit(HaobanRoleQDTO haobanRoleQDTO,WebLoginDTO login);
 
+
+    /**
+     * 运维编辑
+     * @param haobanRoleQDTO
+     * @param login
+     * @return
+     */
+    ServiceResponse editOperation(HaobanRoleQDTO haobanRoleQDTO,WebLoginDTO login);
+
     /**
      * 获取类型菜单
      *

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/HaobanRoleController.java → haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/HaobanRoleOperationController.java

@@ -25,7 +25,7 @@ import java.util.List;
  */
 @RequestMapping("role")
 @RestController
-public class HaobanRoleController {
+public class HaobanRoleOperationController {
 
     @Autowired
     private HaobanMenuApiService haobanMenuApiService;
@@ -55,7 +55,7 @@ public class HaobanRoleController {
         login.setWxEnterpriseId(haobanRoleQDTO.getWxEnterpriseId());
         login.setClerkId(operationUserId);
         login.setClerkName(loginUser.getLoginName());
-        return RestResponse.successResult(haobanRoleApiService.edit(haobanRoleQDTO,login));
+        return RestResponse.successResult(haobanRoleApiService.editOperation(haobanRoleQDTO,login));
     }
 
     /**

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java

@@ -161,6 +161,46 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
         return ServiceResponse.success();
     }
 
+    @Override
+    public ServiceResponse editOperation(HaobanRoleQDTO haobanRoleQDTO, WebLoginDTO login) {
+        HaobanRoleMenuQDTO clerkMenus = haobanRoleQDTO.getClerkMenus();
+        HaobanRoleMenuQDTO manegeClerkMenus = haobanRoleQDTO.getManegeClerkMenus();
+        HaobanRoleMenuQDTO managerMenus = haobanRoleQDTO.getManagerMenus();
+        String wxEnterpriseId = login.getWxEnterpriseId();
+        String clerkId = login.getClerkId();
+        String clerkName = login.getClerkName();
+        List<TabHaobanRoleMenu> tabHaobanRoleMenus = new ArrayList<>();
+        Date now = new Date();
+        //导购
+        if (clerkMenus != null) {
+            TabHaobanRole tabHaobanRole = updateTabHaobanRole(haobanRoleQDTO, clerkMenus, wxEnterpriseId, clerkId, clerkName, now);
+            List<String> menuCodes = clerkMenus.getMenuCodes();
+            for (String menuCode : menuCodes) {
+                getTabHaobanRoleMenu(wxEnterpriseId, tabHaobanRoleMenus, now, tabHaobanRole, menuCode);
+            }
+        }
+
+        //店长
+        if (manegeClerkMenus != null) {
+            TabHaobanRole tabHaobanRole = updateTabHaobanRole(haobanRoleQDTO, manegeClerkMenus, wxEnterpriseId, clerkId, clerkName, now);
+            List<String> menuCodes = manegeClerkMenus.getMenuCodes();
+            for (String menuCode : menuCodes) {
+                getTabHaobanRoleMenu(wxEnterpriseId, tabHaobanRoleMenus, now, tabHaobanRole, menuCode);
+            }
+        }
+
+        //导购
+        if (managerMenus != null) {
+            TabHaobanRole tabHaobanRole = updateTabHaobanRole(haobanRoleQDTO, managerMenus, wxEnterpriseId, clerkId, clerkName, now);
+            List<String> menuCodes = managerMenus.getMenuCodes();
+            for (String menuCode : menuCodes) {
+                getTabHaobanRoleMenu(wxEnterpriseId, tabHaobanRoleMenus, now, tabHaobanRole, menuCode);
+            }
+        }
+        haobanRoleMenuService.insertBatch(tabHaobanRoleMenus);
+        return ServiceResponse.success();
+    }
+
     private TabHaobanRole updateTabHaobanRole(HaobanRoleQDTO haobanRoleQDTO, HaobanRoleMenuQDTO managerMenus, String wxEnterpriseId, String clerkId, String clerkName, Date now) {
         Long roleId = managerMenus.getRoleId();
         if (roleId == null) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java

@@ -782,9 +782,6 @@ public class ClerkController extends WebBaseController {
             }
             clerkStoreList.add(vo);
         }
-        if (CollectionUtil.isNotEmpty(clerkStoreList)) {
-            clerkStoreList = clerkStoreList.stream().filter(s -> StringUtils.isNotBlank(s.getStoreId())).collect(Collectors.toList());
-        }
         return clerkStoreList;
     }