1、小程序以及后台导办人员不可进行转派操作；2、后台其他附件与回复模板导办人员仅可修改和删除自己创建的；

fengjin

2022-11-09 319e5c0c966ed49f02aff8237777d0e18b33b500

1、小程序以及后台导办人员不可进行转派操作；2、后台其他附件与回复模板导办人员仅可修改和删除自己创建的；

 flower_city/src/main/java/com/dg/core/api/ElseAccessoryAppletsController.java

@@ -48,7 +48,7 @@
        {
            return getDataTable("您没有权限查看该数据");
        }
        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids);
        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids,sysUser.getUserId());
        int num=iElseAccessoryService.countNum(Name,ids);
        return getDataTable(list,num);
    }

 flower_city/src/main/java/com/dg/core/api/ReplyTemplateAppletsController.java

@@ -50,7 +50,7 @@
        {
            return getDataTable("您没有权限查看该数据");
        }
        List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
        List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,null);
        int num=iReplyTemplateService.countNum(Name,ids);
        return getDataTable(list,num);
    }

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

@@ -47,7 +47,12 @@
    {
        Page<ElseAccessoryEntity> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids);
        List<ElseAccessoryEntity> list;
        if (sysUser.getUserType().equals("2")){
         list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,sysUser.getUserId());}
        else {
            list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,null);
        }
        int num=iElseAccessoryService.countNum(name,ids);
        return getDataTable(list,num);
    }
@@ -64,7 +69,7 @@
                                             @CurrentUser SysUser sysUser)
    {
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids);
        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids,sysUser.getUserId());
        int num=iElseAccessoryService.countNum(Name,ids);
        return getDataTable(list,num);
    }
@@ -78,7 +83,7 @@
    @ApiOperation("新增附件")
    @PostMapping(path = "/add")
    @Authorization
    public ResultData insertConfig(@RequestBody ElseAccessoryEntity entity)
    public ResultData insertConfig(@RequestBody ElseAccessoryEntity entity,@CurrentUser SysUser sysUser)
    {
        if(entity==null)
        {
@@ -99,7 +104,7 @@
        {
            return ResultData.error("部门不能为空");
        }

        entity.setCreateUserId(sysUser.getUserId());
        return toAjax(iElseAccessoryService.insertConfig(entity));
    }


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

@@ -45,7 +45,12 @@
    {
        Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
        List<ReplyTemplateEntity> list;
        if (sysUser.getUserType().equals("2")){
              list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,sysUser.getUserId());}
        else {
            list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,null);
        }
        int num=iReplyTemplateService.countNum(Name,ids);
        return getDataTable(list,num);
    }

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

@@ -390,6 +390,20 @@
    }


    /**
     * 获取登录人员信息
     *
     * @return 结果
     */
    @ApiOperation("获取登录人员信息")
    @PostMapping("/getLoginInformation")
    @Authorization
    public ResultData getLoginInformation(@CurrentUser SysUser sysUse)
    {
      return  ResultData.success(sysUse);
    }






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

@@ -66,4 +66,19 @@
    @ApiModelProperty(name = "url", value = "文件地址")
    private String url;

    /**
     * 创建人id
     */
    @ApiModelProperty(name = "id", value = "创建人id")
    private String createUserId;

    /**
     * 是否能删除修改
     */
    @TableField(exist = false)
    @ApiModelProperty(name = "isDelete", value = "是否能删除修改")
    private Integer isDelete;



}

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

@@ -147,4 +147,12 @@
    @ApiModelProperty("推荐办事指南列表")
    private List<TransactionEvent> transactionEventList;


    /**
     * 是否能够删除修改
     */
    @TableField(exist = false)
    @ApiModelProperty("是否能够删除修改")
    private Integer isDelete;

}

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

@@ -60,7 +60,7 @@
    /**
     * 用户类型（1系统后台用户     2导办人员用户）
     */
    @ApiModelProperty("用户类型（1系统后台用户     2导办人员用户）")
    @ApiModelProperty("用户类型（1系统后台用户     2导办人员用户  3.部门领导  4.普通用户（小程序用户））")
    private String userType;



 flower_city/src/main/java/com/dg/core/db/gen/mapper/ElseAccessoryMapper.java

@@ -19,7 +19,8 @@
     */
    public List<ElseAccessoryEntity> selectConfigList(IPage<ElseAccessoryEntity> page, Integer state,
                                                      @Param("Name") String Name,
                                                      @Param("ids") List<String> ids);
                                                      @Param("ids") List<String> ids,
                                                      @Param("userId") String userId);

    /**
     * 获取附件列表全部
@@ -27,7 +28,8 @@
     * @return
     */
    public List<ElseAccessoryEntity> selectConfigList(@Param("Name") String Name,
                                                      @Param("ids") List<String> ids);
                                                      @Param("ids") List<String> ids,
                                                      @Param("userId") String userId);


    /**

 flower_city/src/main/java/com/dg/core/db/gen/mapper/ReplyTemplateMapper.java

@@ -16,7 +16,8 @@
     */
    public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page, Integer state,
                                                      @Param("Name") String Name,
                                                      @Param("ids") List<String> ids);
                                                      @Param("ids") List<String> ids,
                                                      @Param("userId")  String  userId);


    /**

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

@@ -16,14 +16,14 @@
     * @return
     */
    public List<ElseAccessoryEntity> selectConfigList(IPage<ElseAccessoryEntity> page, Integer state,
                                                      String Name,List<String> ids);
                                                      String Name,List<String> ids,String userId);

    /**
     * 获取附件列表全部
     * @param Name
     * @return
     */
    public List<ElseAccessoryEntity> selectConfigList(String Name,List<String> ids);
    public List<ElseAccessoryEntity> selectConfigList(String Name,List<String> ids,String userId);


    /**

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

@@ -12,7 +12,7 @@
     * @return
     */
    public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page, Integer state,
                                                      String Name,List<String> ids);
                                                      String Name,List<String> ids,String userId);

    /**
     * 获取详情

 flower_city/src/main/java/com/dg/core/service/impl/ElseAccessoryImpl.java

@@ -16,13 +16,13 @@

    @Override
    public List<ElseAccessoryEntity> selectConfigList(IPage<ElseAccessoryEntity> page, Integer state,
                                                      String Name,List<String> ids) {
        return baseMapper.selectConfigList(page,state,Name, ids);
                                                      String Name,List<String> ids,String userId) {
        return baseMapper.selectConfigList(page,state,Name, ids,userId);
    }

    @Override
    public List<ElseAccessoryEntity> selectConfigList(String Name,List<String> ids) {
        return baseMapper.selectConfigList(Name,ids);
    public List<ElseAccessoryEntity> selectConfigList(String Name,List<String> ids,String userId) {
        return baseMapper.selectConfigList(Name,ids,userId);
    }

    @Override

 flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java

@@ -26,7 +26,7 @@
    @Override
    public List<GuideEvolveEntity> selectConfigList(String guideId,SysUser sysUser) {
        List<GuideEvolveEntity> guideEvolveEntities;
        if (sysUser.getUserType().equals("3")){
        if (sysUser.getUserType().equals("4")){
            guideEvolveEntities=baseMapper.selectHideList(guideId);
        }else {
            guideEvolveEntities = baseMapper.selectConfigList(guideId);

 flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java

@@ -26,8 +26,8 @@

    @Override
    public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page,
                                                      Integer state,String Name,List<String> ids) {
        return baseMapper.selectConfigList(page,state,Name,ids);
                                                      Integer state,String Name,List<String> ids,String userId) {
        return baseMapper.selectConfigList(page,state,Name,ids,userId);
    }

    @Override

 flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java

@@ -92,7 +92,7 @@
                newUser.setUserId(huaChengSysUser.getUserId()+"");
                newUser.setLoginName(huaChengSysUser.getPhone());
                newUser.setUserName(huaChengSysUser.getNickName());
                newUser.setUserType("3");
                newUser.setUserType("4");
                newUser.setPhonenumber(huaChengSysUser.getPhone());
                newUser.setSex(huaChengSysUser.getSex());
                newUser.setAvatar(huaChengSysUser.getImageUrl());
@@ -304,4 +304,9 @@








}

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

@@ -26,7 +26,23 @@
    </sql>

    <select id="selectConfigList"  resultMap="ElseAccessoryEntityResult">
        <include refid="selectElseAccessoryEntityVo"/>
        SELECT
        id,
        department_id,
        (select organization_name from automessage_organization_chart where automessage_organization_chart.id=automessage_else_accessory.department_id) as departmentName,
        create_time,
        update_time,
        url,
        name,
        create_user_id,
        <if test="userId!=null and userId!=''">
        (case create_user_id when  #{userId} then 1 else 0 end)isDelete
        </if>
        <if test="userId==null or userId==''">
            1 isDelete
        </if>
        FROM
        automessage_else_accessory
        <where>
            <if test="Name != null and Name != ''">
                AND automessage_else_accessory.name like concat('%', #{Name}, '%')
@@ -57,6 +73,7 @@
        <if test="departmentId != null and departmentId != '' ">department_id,</if>
        <if test="name != null and name != '' ">name,</if>
        <if test="url != null and url != '' ">url,</if>
        <if test="createUserId != null and createUserId != '' ">create_user_id,</if>
        update_time,
        create_time
        )values(
@@ -64,6 +81,7 @@
        <if test="departmentId != null and departmentId != '' ">#{departmentId},</if>
        <if test="name != null and name != ''  ">#{name},</if>
        <if test="url != null and url != '' ">#{url},</if>
        <if test="createUserId != null and createUserId != '' ">#{createUserId},</if>
        sysdate(),
        sysdate()
        )

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

@@ -65,10 +65,10 @@
            id,
            departmental_id,
            IFNULL(
                    (select  concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.to_user_id=user_id and user_type in (1,2)),
                    (select  concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.to_user_id=user_id and user_type in (1,2,3)),
                    (select user_name from automessage_sys_user where a.to_user_id=user_id))toUserName,
            IFNULL(
                    (select  concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.from_user_id=user_id and user_type in (1,2)),
                    (select  concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.from_user_id=user_id and user_type in (1,2,3)),
                    (select user_name from automessage_sys_user where a.from_user_id=user_id))fromUserName,
            to_user_id,
            from_user_id,

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

@@ -47,7 +47,33 @@
    </sql>

    <select id="selectConfigList"  resultMap="ReplyTemplateResult">
        <include refid="selectReplyTemplateVo"/>
        SELECT
        id,
        name,
        create_time,
        update_time,
        handle_state,
        response,
        accessory_url,
        accessory_name,
        video_url,
        video_name,
        picture_url,
        picture_name,
        department_id,
        create_user_id,
        <if test="userId!=null and userId!=''">
            (case create_user_id when  #{userId} then 1 else 0 end)isDelete,
        </if>
        <if test="userId==null or userId==''">
            1 isDelete,
        </if>
        accessory_id,
        (select organization_name from automessage_organization_chart where automessage_organization_chart.id=automessage_reply_template.department_id) as departmentName,
        (select user_name from automessage_sys_user where automessage_sys_user.user_id=automessage_reply_template.create_user_id) as createUser,
        guidance
        FROM
        automessage_reply_template
        <where>
            <if test="Name != null and Name != ''">
                AND automessage_reply_template.name like concat('%', #{Name}, '%')