bug修改

puhanshu

2022-07-23 c6971549f2c35abedde6608e36d4a5062ca6e5c5

bug修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java

@@ -56,4 +56,7 @@

    @ApiModelProperty(value = "区域编码", hidden = true)
    private String areaCode;

    @ApiModelProperty(value = "appid", hidden = true)
    private String appid;
}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java

@@ -596,6 +596,7 @@
    @PostMapping("serviceteam")
    public R addServiceTeam(@RequestBody @Validated(AddGroup.class) ComPbServiceTeamDTO comPbServiceTeamDTO) {
        comPbServiceTeamDTO.setCommunityId(this.getCommunityId());
        comPbServiceTeamDTO.setAppid(this.getAppId());
        return partyBuildingService.addServiceTeam(comPbServiceTeamDTO);
    }


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

@@ -1,5 +1,7 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.io.Serializable;
@@ -17,6 +19,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 社区id

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

@@ -1,5 +1,7 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.io.Serializable;
@@ -17,6 +19,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 社区id

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

@@ -1,5 +1,7 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.io.Serializable;
@@ -17,6 +19,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 社区id

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerSkillDao.xml

@@ -59,12 +59,6 @@
        order by cmvs.create_at desc
    </select>

    <!--新增所有列-->
    <insert id="insert" keyProperty="id" useGeneratedKeys="true">
        insert into com_mng_volunteer_skill(community_id, name, remark, create_at, create_by, update_at, update_by)
        values (#{communityId}, #{name}, #{remark}, #{createAt}, #{createBy}, #{updateAt}, #{updateBy})
    </insert>

    <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
        insert into com_mng_volunteer_skill(community_id, name, remark, create_at, create_by, update_at, update_by)
        values

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java

@@ -45,10 +45,10 @@
    /**
     * 根据手机号查询小程序用户id
     * @param phone 手机号
     * @param areaCode
     * @param appid
     * @return  小程序用户id
     */
    Long getSysUserIdByPhone(@Param("phone") String phone, @Param("areaCode") String areaCode);
    Long getSysUserIdByPhone(@Param("phone") String phone, @Param("appid") String appid);

    @Update("update sys_user u set u.phone=#{newphone} where u.phone=#{oldphone}")
    void updateUserPhone(@Param("newphone") String newphone, @Param("oldphone") String oldphone);

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java

@@ -54,7 +54,7 @@
        ComPbServiceTeamDO comPbServiceTeamDO = new ComPbServiceTeamDO();
        BeanUtils.copyProperties(comPbServiceTeamDTO, comPbServiceTeamDO);
        comPbServiceTeamDO.setIsReg(2);
        Long userId = comPbMemberRoleDAO.getSysUserIdByPhone(comPbServiceTeamDTO.getPhone(), comPbServiceTeamDTO.getAreaCode());
        Long userId = comPbMemberRoleDAO.getSysUserIdByPhone(comPbServiceTeamDTO.getPhone(), comPbServiceTeamDTO.getAppid());
        if (nonNull(userId)) {
            comPbServiceTeamDO.setIsReg(1);
        }

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberRoleDOMapper.xml

@@ -35,7 +35,7 @@
    </sql>

    <select id="getSysUserIdByPhone" resultType="long">
        SELECT user_id FROM sys_user WHERE phone = #{phone} AND `type` = 1
        SELECT user_id FROM sys_user WHERE phone = #{phone} AND app_id = #{appid} AND `type` = 1
    </select>

    <select id="getSysUserByIdCardCount" resultType="integer">