修改组织架构删除接口 小程序注册用户不能登录导办人员 修改用户查询接口 bug

lidongdong

2022-10-14 f490e99ab8a861cdf61890f1f6f39b65e9def253

修改组织架构删除接口  小程序注册用户不能登录导办人员  修改用户查询接口 bug

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

@@ -5,6 +5,7 @@
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.db.gen.entity.ClassifyAdministration;
import com.dg.core.db.gen.entity.OrganizationChartEntity;
import com.dg.core.db.gen.entity.TransactionEvent;
import com.dg.core.service.IClassifyAdministrationService;
import com.dg.core.service.ITransactionEventService;
@@ -16,6 +17,7 @@
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.List;


@@ -167,8 +169,22 @@



    /**
     * 树状分类选择列表
     * @return
     */
    @ApiOperation("树状分类选择列表")
    @GetMapping("/getClassifyList")
    public TableDataInfo getClassifyList()
    {
        List<ClassifyAdministration> list=iClassifyAdministrationService.selectConfigList("","1");


        for(ClassifyAdministration entity:list)
        {
            entity.setClassifyAdministrationEntityList(iClassifyAdministrationService.selectParentData(entity.getId()+""));
        }
        return getDataTable(list);
    }




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

@@ -92,16 +92,16 @@
            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");

        SysUser user=IUserService.selectData(null,config.getPhonenumber());
        if (user != null)
        {
            config.setId(user.getId());
            //提示用户名或密码错误
            return toAjax(IUserService.updateConfig(config));
        }

        config.setCreateTime(LocalDateTime.now());
        config.setUpdateTime(LocalDateTime.now());
        config.setUserId(Snowflake.getId());

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

@@ -6,7 +6,9 @@
import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.OrganizationChartEntity;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.db.gen.entity.TransactionEvent;
import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.ITransactionEventService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -28,6 +30,9 @@

    @Autowired(required = true)
    IOrganizationChartService iOrganizationChartService;

    @Autowired(required = true)
    ITransactionEventService iTransactionEventService;

    /**
     * 查询机构列表
@@ -93,6 +98,15 @@
        if(list!=null && list.size()>0)
        {
            return ResultData.error("该机构下存在其他部门！请先删除子部门");
        }

        List<String> ids=new ArrayList<>();
        ids.add(Id);
        List<TransactionEvent> transactionEvents=iTransactionEventService.selectConfigList(null,null,ids);

        if(transactionEvents!=null && transactionEvents.size()>0)
        {
            return ResultData.error("该机构下已绑定办事指南！请解绑办事指南");
        }
        return toAjax(iOrganizationChartService.deleteConfigById(Id));
    }
@@ -162,7 +176,6 @@
        List<OrganizationChartEntity> ids=new ArrayList<>();
        for (OrganizationChartEntity sysStreet:lists)
        {
            ids.add(sysStreet);
            if(sysStreet.getChild()!=null && sysStreet.getChild().size()>0)
            {
                ids.addAll(disposestreet(sysStreet.getChild()));

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

@@ -236,4 +236,5 @@

    }


}

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

@@ -62,7 +62,7 @@
            }

            //本地表查询用户
            user = IUserService.selectData(huaChengSysUser.getUserId()+"");
            user = IUserService.selectData(huaChengSysUser.getUserId()+"",null);
            if (user == null) {
                //本地没有此用户  新用户
                SysUser newSysUser=new SysUser();
@@ -79,7 +79,7 @@
                IUserService.insertConfig(newSysUser);
            }

            user = IUserService.selectData(huaChengSysUser.getUserId()+"");
            user = IUserService.selectData(huaChengSysUser.getUserId()+"",null);

            if (user == null) {
                return ResultData.error("用户不存在！请联系管理员");
@@ -280,7 +280,7 @@
            return error("userId不能为空");
        }

        SysUser sysUser=IUserService.selectData(userId);
        SysUser sysUser=IUserService.selectData(userId,null);
        //删除标志（0代表存在 2代表删除）
        sysUser.setDelFlag("2");
        return toAjax(IUserService.updateConfig(sysUser));
@@ -308,7 +308,7 @@
            return error("密码不能为空");
        }

        SysUser sysUser=IUserService.selectData(config.getUserId()+"");
        SysUser sysUser=IUserService.selectData(config.getUserId()+"",null);
        if(sysUser==null)
        {
            return error("用户不存在");

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

@@ -74,8 +74,7 @@
    private String parentName;

    @TableField(exist = false)
    @ApiModelProperty(name = "ClassifyAdministrationEntityList", value = "父级分类名字")
    @ApiModelProperty(name = "ClassifyAdministrationEntityList", value = "下级分类")
    private List<ClassifyAdministration> ClassifyAdministrationEntityList;


}

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

@@ -77,6 +77,9 @@
    List<String>  selectParent(String parentId);


    List<ClassifyAdministration>  selectParentData(String parentId);




}

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

@@ -29,7 +29,7 @@



    SysUser selectData(String userId);
    SysUser selectData(@Param("userId") String userId,@Param("phonenumber") String phonenumber);


    /**

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

@@ -28,6 +28,17 @@
                                                   @Param("classifyGrade") String classifyGrade,
                                                   @Param("ids") List<String> ids);



    /**
     * 导办事物列表 (部分也)
     * @param
     * @return
     */
    public List<TransactionEvent> selectConfigList(@Param("matterAndUser") String matterAndUser,
                                                   @Param("classifyGrade") String classifyGrade,
                                                   @Param("ids") List<String> ids);

    /**
     * 新增导办事务
     * @param entity

 flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java

@@ -62,7 +62,7 @@
                //如果token验证成功，权限检查通过，将token对应的用户id存在request中，便于之后注入
                request.setAttribute(Constant.CURRENT_USER_ID, manager.getHCUserId(HCtoken));
                System.out.println("花城用户id："+manager.getHCUserId(HCtoken));
                SysUser ss = IUserService.selectData(manager.getHCUserId(HCtoken)+"");
                SysUser ss = IUserService.selectData(manager.getHCUserId(HCtoken)+"",null);
                if(ss==null && ss.getUserId()<0)
                {
                    HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(manager.getHCUserId(HCtoken)+"","","");

 flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java

@@ -39,7 +39,7 @@
        Long currentUserId = (Long) webRequest.getAttribute(Constant.CURRENT_USER_ID, RequestAttributes.SCOPE_REQUEST);
        if (currentUserId != null) {
            //从数据库中查询并返回
            return userService.selectData(currentUserId+"");
            return userService.selectData(currentUserId+"",null);
        }
        return null;
//        throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);

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

@@ -79,5 +79,7 @@
     */
    List<String>  selectParent(String parentId);

    List<ClassifyAdministration>  selectParentData(String parentId);


}

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

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


    SysUser selectData(String userId);
    SysUser selectData(String userId,String phonenumber);

    /**
     * 新增聊天记录

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

@@ -28,6 +28,13 @@
                                                   List<String> ids);

    /**
     * 导办事物列表
     * @return
     */
    public List<TransactionEvent> selectConfigList(String matterAndUser, String classifyGrade,
                                                   List<String> ids);

    /**
     * 新增导办事务
     * @param entity
     * @return

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

@@ -74,6 +74,11 @@
        return baseMapper.selectParent(parentId);
    }

    @Override
    public List<ClassifyAdministration> selectParentData(String parentId) {
        return baseMapper.selectParentData(parentId);
    }


    @Override
    public int insertConfig(ClassifyAdministration entity) {

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

@@ -250,8 +250,8 @@
    }

    @Override
    public SysUser selectData(String userId) {
        return baseMapper.selectData(userId);
    public SysUser selectData(String userId,String phonenumber) {
        return baseMapper.selectData(userId,phonenumber);
    }



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

@@ -70,6 +70,11 @@
    }

    @Override
    public List<TransactionEvent> selectConfigList(String matterAndUser, String classifyGrade, List<String> ids) {
        return baseMapper.selectConfigList(matterAndUser,classifyGrade,ids);
    }

    @Override
    public int insertConfig(TransactionEvent entity) {
        return baseMapper.insertConfig(entity);
    }

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

@@ -113,6 +113,15 @@
        </where>
    </select>

    <select id="selectParentData" resultType="com.dg.core.db.gen.entity.ClassifyAdministration">
        <include refid="selectClassifyAdministrationEntityVo"/>
        <where>
            <if test="parentId != null and parentId != ''">
                AND parent_id = #{parentId}
            </if>
        </where>
    </select>





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

@@ -116,6 +116,11 @@
            <if test="userId!=null and userId!='' ">
                user_id= #{userId}
            </if>

            <if test="phonenumber!=null and phonenumber!='' ">
                phonenumber= #{phonenumber}
            </if>

        </where>
    </select>

@@ -245,7 +250,7 @@
            <if test="openid != null and openid != '' ">,openid=#{openid}</if>
            ,update_time=sysdate()
        </set>
        where user_id= #{userId}
        where id= #{id}
    </update>

    <delete id="deleteConfigById" parameterType="string">