修改回复模板报错 bug

lidongdong

2022-10-13 c9cd30d5beab336ff61da1d6f6cdbe28c4dcd4e8

修改回复模板报错 bug

 flower_city/src/main/java/com/dg/core/controller/GuideDoController.java

@@ -87,12 +87,19 @@
            return error("昵称不能为空");
        }

        SysUser user = IUserService.getUserByAccount(config.getLoginName());
        if (user != null) {
            //提示用户名或密码错误
            return error("该账户已存在！");
        if(StringUtils.isEmpty(config.getDepartmentId()))
        {
            return error("部门不能为空");
        }

        ResultData data = IUserService.loginByPhonenumber(config.getPhonenumber());
        if (data != null)
        {
            SysUser user= (SysUser) data.getData();
            user.setUserType("2");
            //提示用户名或密码错误
            return toAjax(IUserService.updateConfig(user));
        }
        config.setUserType("2");

        config.setCreateTime(LocalDateTime.now());

 flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java

@@ -44,17 +44,6 @@
    {
        Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
        String[] roles = sysUser.getRoleIds().split(",");
        Integer isRole=0;//是否超管
        for (String role: roles) {
            if (role.equals("1")){
                isRole=1;
                break;
            }
        }
        if (isRole.equals(1)){
            ids=null;
        }
        List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
        int num=iReplyTemplateService.countNum(Name,ids);
        return getDataTable(list,num);

 flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java

@@ -255,7 +255,11 @@



    @ApiModelProperty(name = "operationalGuidelineVideoName", value = "操作指南视频名称")
    private String  operationalGuidelineVideoName;

    @ApiModelProperty(name = "operationalGuidelineName", value = "操作指南名称")
    private  String  operationalGuidelineName;




 flower_city/src/main/java/com/dg/core/service/ISysUserService.java

@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.dg.core.ResultData;
import com.dg.core.db.gen.entity.SysUser;
import org.springframework.data.repository.query.Param;

import java.util.List;

@@ -17,7 +16,9 @@
     */
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType);


    SysUser selectData(String userId);

    /**
     * 新增聊天记录
     *
@@ -41,7 +42,6 @@
     * @return 结果
     */
    public int deleteConfigById(String id);


    /**
     * 获取数据库总条数（批量）
@@ -71,7 +71,6 @@
     */
    List<SysUser> selectListByDepartmentId(String departmentId,String classifyId);


    /**
     * 通过手机号获取用户信息
     *
@@ -79,13 +78,12 @@
     */
    ResultData loginByPhonenumber(String phonenumber);


    /**
     * 查询用户列表（不分页）
     * @param userType 用户类型
     * @return 结果
     */
    List<SysUser>  queryList(Integer userType);
    List<SysUser> queryList(Integer userType);


}

 flower_city/src/main/resources/mapper/TransactionEventMapper.xml

@@ -42,6 +42,8 @@
        <id     property="commonProblem"      column="common_problem"      />
        <id     property="commonProblemUrl"      column="common_problem_url"      />
        <id     property="commonProblemName"      column="common_problem_name"      />
        <id     property="operationalGuidelineVideoName"      column="operational_guideline_video_name"      />
        <id     property="operationalGuidelineName"      column="operational_guideline_name"      />

    </resultMap>

@@ -82,6 +84,8 @@
            common_problem_url,
            common_problem_name,
            operational_guideline_video_url,
            operational_guideline_video_name,
            operational_guideline_name,
            (IF((select classify_grade from automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id)='2',
                (select classify_name from automessage_classify_administration where automessage_classify_administration.id=(select parent_id from
                automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id)),
@@ -185,6 +189,8 @@
        <if test="commonProblem != null and commonProblem != '' ">common_problem,</if>
        <if test="commonProblemUrl != null and commonProblemUrl != '' ">common_problem_url,</if>
        <if test="commonProblemName != null and commonProblemName != '' ">common_problem_name,</if>
        <if test="operationalGuidelineVideoName != null and operationalGuidelineVideoName != '' ">operational_guideline_video_name,</if>
        <if test="operationalGuidelineName != null and operationalGuidelineName != '' ">operational_guideline_name,</if>
        update_time,
        create_time
        )values(
@@ -221,6 +227,8 @@
        <if test="commonProblem != null and commonProblem != '' ">#{commonProblem},</if>
        <if test="commonProblemUrl != null and commonProblemUrl != '' ">#{commonProblemUrl},</if>
        <if test="commonProblemName != null and commonProblemName != '' ">#{commonProblemName},</if>
        <if test="operationalGuidelineVideoName != null and operationalGuidelineVideoName != '' ">#{operationalGuidelineVideoName},</if>
        <if test="operationalGuidelineName != null and operationalGuidelineName != '' ">#{operationalGuidelineName},</if>
        sysdate(),
        sysdate()
        )
@@ -262,6 +270,8 @@
            <if test="commonProblemUrl != null and commonProblemUrl != '' ">common_problem_url=#{commonProblemUrl},</if>
            <if test="commonProblemName != null and commonProblemName != '' ">common_problem_name=#{commonProblemName},</if>
            <if test="operationalGuidelineVideoUrl != null ">operational_guideline_video_url=#{operationalGuidelineVideoUrl},</if>
            <if test="operationalGuidelineVideoName != null and operationalGuidelineVideoName != '' ">operational_guideline_video_name=#{operationalGuidelineVideoName},</if>
            <if test="operationalGuidelineName != null and operationalGuidelineName != '' ">operational_guideline_name=#{operationalGuidelineName},</if>
            update_time=sysdate()
        </set>
        where  id= #{id}