优化代码

java110-bean/src/main/java/com/java110/dto/menuGroup/MenuGroupDto.java

@@ -23,6 +23,8 @@ public class MenuGroupDto extends PageDto implements Serializable {
     private String userId;
     private String domain;
     private String caId;
+    private String communityId;
+
 
     public String getgId() {
         return gId;
@@ -127,4 +129,12 @@ public class MenuGroupDto extends PageDto implements Serializable {
     public void setgIds(String[] gIds) {
         this.gIds = gIds;
     }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
 }

java110-db/src/main/resources/mapper/user/MenuCatalogV1ServiceDaoImplMapper.xml

@@ -125,14 +125,20 @@
         FROM m_menu mm
         inner join m_menu_group mmg on mm.`g_id` = mmg.`g_id` AND mmg.`status_cd` = '0'
         <if test="caId !=null and caId != ''">
-        inner join m_menu_group_catalog mgc on mmg.g_id = mgc.g_id and mgc.status_cd = '0'
+            inner join m_menu_group_catalog mgc on mmg.g_id = mgc.g_id and mgc.status_cd = '0'
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            inner join m_menu_group_community mgcy on mgcy.g_id = mmg.g_id and mgcy.status_cd = '0'
         </if>
         WHERE
-         mmg.group_type = #{groupType}
+        mmg.group_type = #{groupType}
         and mmg.store_type= #{domain}
         <if test="caId !=null and caId != ''">
             and mgc.ca_id = #{caId}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and mgcy.community_id = #{communityId}
+        </if>
         AND mm.`status_cd` = '0'
         AND mm.`m_id` IN (
         SELECT pp.`m_id` FROM p_privilege_user ppu,p_privilege pp

service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogMenusCmd.java

@@ -32,7 +32,6 @@ import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
 import java.util.List;
@@ -73,6 +72,7 @@ public class ListCatalogMenusCmd extends AbstractServiceCmdListener {
 
         MenuGroupDto menuCatalogDto = BeanConvertUtil.covertBean(reqJson, MenuGroupDto.class);
         menuCatalogDto.setGroupType(MenuGroupDto.GROUP_TYPE_PC);
+        //判断是否 为 开发或者运营，如果是开发或者运营时 取消 小区ID
 
         //查询store 信息
         StoreDto storeDto = new StoreDto();
@@ -81,6 +81,10 @@ public class ListCatalogMenusCmd extends AbstractServiceCmdListener {
 
         Assert.listOnlyOne(storeDtos, "商户不存在");
 
+        if (StoreDto.STORE_TYPE_ADMIN.equals(storeDtos.get(0).getStoreTypeCd()) || StoreDto.STORE_TYPE_DEV.equals(storeDtos.get(0).getStoreTypeCd())) {
+            menuCatalogDto.setCommunityId("");
+        }
+
         menuCatalogDto.setDomain(storeDtos.get(0).getStoreTypeCd());
         menuCatalogDto.setStoreType(storeDtos.get(0).getStoreTypeCd());