好办自建应用菜单过滤取消

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

@@ -7,8 +7,6 @@ import com.gic.clerk.api.service.RightService;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
-import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
-import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -32,15 +30,9 @@ import java.util.*;
 public class RightController extends WebBaseController {
 
     private static final Logger log = LogManager.getLogger(RightController.class);
-    /**
-     * 好办付费应用菜单code
-     */
-    private static final Set<String> menuCodeSet = new HashSet<>(Arrays.asList("hb_m040902","purchaseAppOrder","appOrderPay","appCancelOrder"));
 
     @Autowired
     private RightService rightService;
-    @Autowired
-    private WxEnterpriseApiService wxEnterpriseApiService;
 
     @RequestMapping("get-haoban-menu")
     public HaobanResponse getHaobanMenu(HttpServletRequest request) {
@@ -48,7 +40,6 @@ public class RightController extends WebBaseController {
         log.info(JSON.toJSONString(login));
         String enterpriseId = login.getEnterpriseId() ;
         String clerkId = login.getClerkId() ;
-        String wxEnterpriseId = login.getWxEnterpriseId();
         if(StringUtils.isBlank(enterpriseId)){
             return resultResponse(HaoBanErrCode.ERR_OTHER, "gic商户为空");
         }
@@ -56,23 +47,8 @@ public class RightController extends WebBaseController {
         if(StringUtils.isEmpty(clerkId)) {
             return resultResponse(HaoBanErrCode.ERR_OTHER, "clerkId为空");
         }
-        if(StringUtils.isEmpty(wxEnterpriseId)) {
-            return resultResponse(HaoBanErrCode.ERR_OTHER, "wxEnterpriseId为空");
-        }
         ServiceResponse<List<RightMenuDTO>> resp = this.rightService.getHaobanMenu(enterpriseId, clerkId);
         if (resp.isSuccess()) {
-            //如果是好办自建应用，应用购买的菜单需要过滤
-            WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxEnterpriseId);
-            if (null != wxEnterpriseDTO && wxEnterpriseDTO.getWxSecurityType() == 5){
-                List<RightMenuDTO> list = resp.getResult();
-                for (int i =0;i<list.size();i++){
-                    RightMenuDTO dto = list.get(i);
-                    if (menuCodeSet.contains(dto.getMenuCode())){
-                        list.remove(dto);
-                    }
-                }
-                resp.setResult(list);
-            }
             return resultResponse(HaoBanErrCode.ERR_1, resp.getResult());
         }
         return resultResponse(HaoBanErrCode.ERR_OTHER, resp.getMessage());