bug修改

101captain

2022-06-14 e3aaacbccfe7aa6f99e3f116138efd9499abe7a5

bug修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java

@@ -219,6 +219,9 @@
    @ApiModelProperty("区域划分")
    private String areaName;

    @ApiModelProperty("是否单位管理员 1是 0否")
    private Integer isCheckUnitAdmin;

    public String retrieveRelationName() {
        return this.type == 3 ? relationName : name;
    }

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java

@@ -123,5 +123,14 @@
    private String solveContent;
    @ApiModelProperty("反馈图片")
    private String solveUrl;

    @ApiModelProperty("处理状态 0待接收 1正在求助 2待处理 3待评价 4已评价")
    private Integer dealStatus;
    @ApiModelProperty("预计服务时长")
    private String targetServiceTime;
    @ApiModelProperty("实际服务时长")
    private String realServiceTime;
    @ApiModelProperty("评价内容")
    private String comment;
    @ApiModelProperty("说明")
    private String instruction;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java

@@ -152,6 +152,8 @@

    private Date solveTime;

    private Integer dealStatus;

    @Override
    public String toString() {
        return "ComActNeighborCircleDO{" + "id=" + id + ", releaseId=" + releaseId + ", releasePhone=" + releasePhone

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -258,6 +258,13 @@
    ComActAcidMemberVO selectAcidMemberByPhone(@Param("phone") String phone);

    /**
     * 查询单位管理员
     * @param phone
     * @return
     */
    Integer selectOrgAdmin(@Param("phone") String phone);

    /**
     * 根据社区名称查询区县社区联动关系
     * @param relationName
     * @return

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

@@ -434,6 +434,13 @@
                }
                loginUserInfoVO.setRelationName(acidMember.getRelationName());
            }
            Integer count=userDao.selectOrgAdmin(phone);
            if(count>0){
                loginUserInfoVO.setIsCheckUnitAdmin(1);
            }
            else {
                loginUserInfoVO.setIsCheckUnitAdmin(0);
            }
            //是否网格员
            int easyPhotoMember = userDao.countEasyPhotoMember(phone, userCommunityId);
            if (easyPhotoMember > 0) {

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml

@@ -558,4 +558,7 @@
        select t.district_name from com_mng_struct_area_district t left join com_street t1 on t.district_adcode  = t1.area_code where t1.street_id =#{streetId}
    </select>

    <select id="selectOrgAdmin" resultType="Integer">
        select count(*) from com_pb_check_unit where admin_phone = #{phone}
    </select>
</mapper>