Merge branch '20220927' into huacheng_test

zhaozhengjie

2022-09-29 5fb93eaa61d42d7ebb7048057d45e285efd7f0dc

Merge branch '20220927' into huacheng_test

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -8,6 +8,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
@@ -101,7 +102,7 @@
@Slf4j
@RestController
@RequestMapping("/")
public class CommunityApi {
public class CommunityApi extends BaseController {
    @Resource
    public ComMngPopulationDAO comMngPopulationDAO;
    @Resource
@@ -2332,7 +2333,7 @@
     */
    @GetMapping("/eventgrid/community/list")
    public R getCommunityLists() {
        return comActService.getCommunityLists();
        return comActService.getCommunityLists(this.getAppId());
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java

@@ -63,8 +63,8 @@
    void updateAccountPassword(@Param("password") String password, @Param("account") String account,
        @Param("communityId") Long communityId);

    @Select("select community_id,`name`,lng,lat from com_act where state = 0")
    List<EventGridCommunityAdminVO> getCommunityLists();
    @Select("select community_id,`name`,lng,lat from com_act where state = 0 and app_id =#{appId}")
    List<EventGridCommunityAdminVO> getCommunityLists(@Param("appId") String appId);

    @Select("select ca.`name`,cmsap.province_name,cmsac.city_name,cmsad.district_name,ca.street_id,ca.community_id,cs.`name` as streetName from com_act as ca \n"
        + "left join com_mng_struct_area_province as cmsap on cmsap.province_adcode = ca.province_code\n"

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActService.java

@@ -78,7 +78,7 @@
     * 
     * @return 社区列表
     */
    R getCommunityLists();
    R getCommunityLists(String appId);

    /**
     * 查询西区社区列表

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java

@@ -225,8 +225,8 @@
     * @return 社区列表
     */
    @Override
    public R getCommunityLists() {
        return R.ok(this.comActDAO.getCommunityLists());
    public R getCommunityLists(String appId) {
        return R.ok(this.comActDAO.getCommunityLists(appId));
    }

    @Override

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -783,7 +783,7 @@
            loginUserInfoVO.setLevel(1);
        }
        loginUserInfoVO.setBackstageType(1);
        String[] account={"dongqu","xiqu","yanbian","miyi","renhe","fantaixinqu"};
        String[] account={"dongqu","xiqu","yanbianxian","miyixian","renhequ","fantaixinqu"};
        if("zuzhibu".equals(sysUserDO.getAccount())){
            loginUserInfoVO.setBackstageType(2);
        }