修改bug

liujie

21 小时以前 9be538f6fe9d757a1c52577392488855cabb5242

修改bug

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java

@@ -8,6 +8,7 @@
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.AuditUserDto;
import com.ruoyi.system.dto.UpAndDownDTO;
import com.ruoyi.system.dto.UserIdDto;
import com.ruoyi.system.model.TAppUser;
import com.ruoyi.system.query.TAppUserQuery;
import com.ruoyi.system.service.TAppUserService;
@@ -93,8 +94,8 @@
    @ApiOperation(value = "删除人员")
    @PostMapping(value = "/api/t-app-user/delUser")
    public R<?> delUser(@RequestBody String param) {
        String id = JSON.parseObject(param, String.class);
        TAppUser appUser = appUserService.getById(id);
        UserIdDto dto = JSON.parseObject(param, UserIdDto.class);
        TAppUser appUser = appUserService.getById(dto.getId());
        appUser.setDisabled(true);
        appUserService.updateById(appUser);
        return R.ok();
@@ -124,8 +125,8 @@
    @ApiOperation(value = "重置密码")
    @PostMapping(value = "/api/t-app-user/resetPwd")
    public R<?> resetPwd(@RequestBody String param) {
        String id = JSON.parseObject(param, String.class);
        TAppUser appUser = appUserService.getById(id);
        UserIdDto dto = JSON.parseObject(param, UserIdDto.class);
        TAppUser appUser = appUserService.getById(dto.getId());
        String pwd = SecurityUtils.encryptPassword("123456");
        appUser.setPassword(pwd);
        appUserService.updateById(appUser);
@@ -154,8 +155,8 @@
    @ApiOperation(value = "获取人员审核管理详情", response = TAppUserPageVo.class)
    @PostMapping(value = "/api/t-app-user/auditDetail")
    public R<TAppUserPageVo> auditDetail(@RequestBody String param) {
        String id = JSON.parseObject(param, String.class);
        return R.ok(appUserService.pageAuditDetail(id));
        UserIdDto dto = JSON.parseObject(param, UserIdDto.class);
        return R.ok(appUserService.pageAuditDetail(dto.getId()));
    }



 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDivisionTeamController.java

@@ -49,6 +49,18 @@
        return R.ok(divisionTeamService.pageList(query));
    }



    /**
     * 分队管理列表
     */
    //@PreAuthorize("@ss.hasPermi('system:divisionTeam:list')")
    @ApiOperation(value = "分队管理列表", response = TDivisionTeamQuery.class)
    @PostMapping(value = "/api/t-division-team/dataList")
    public R<List<TDivisionTeam>> dataList(@RequestBody String param) {
        return R.ok(divisionTeamService.list());
    }

    /**
     * 添加分队管理管理
     */

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMajorController.java

@@ -98,8 +98,8 @@
    //@PreAuthorize("@ss.hasPermi('system:major:delete')")
    @Log(title = "专业管理信息-删除专业管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除专业管理")
    @DeleteMapping(value = "/open/t-major/deleteById")
    public R<Boolean> deleteById(@RequestParam String id) {
    @DeleteMapping(value = "/open/t-major/deleteById/{id}")
    public R<Boolean> deleteById(@PathVariable String id) {
        return R.ok(tMajorService.removeById(id));
    }


 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java

@@ -90,7 +90,7 @@
    /**
     * 查看人员管理详情--修改队伍情况
     */
    @ApiOperation(value = "查看人员管理详情--修改队伍情况",response = TAppUserEquipment.class)
    @ApiOperation(value = "查看人员管理详情--修改队伍情况",response = UpdateDetailTeamDto.class)
    @PostMapping(value = "/open/t-app-user/updateDetailTeam")
    public R<?> updateDetailTeam(@RequestBody String param) {
        String userId = tokenService.getLoginUserApplet().getUserId();

 ruoyi-system/src/main/java/com/ruoyi/system/dto/UserIdDto.java

New file
@@ -0,0 +1,8 @@
package com.ruoyi.system.dto;

import lombok.Data;

@Data
public class UserIdDto {
    private String id;
}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TDivisionTeamMapper.java

@@ -26,4 +26,5 @@
     */
    List<TDivisionTeam> pageList(@Param("query") TDivisionTeamQuery query, @Param("pageInfo")PageInfo<TDivisionTeam> pageInfo);


}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUserLocation.java

@@ -45,5 +45,12 @@
    @TableField("mission_user_id")
    private String missionUserId;

    @ApiModelProperty(value = "详情")
    @TableField("content")
    private String content;

    @ApiModelProperty(value = "文件")
    @TableField("file_url")
    private String fileUrl;

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TDivisionTeamService.java

@@ -5,6 +5,8 @@
import com.ruoyi.system.model.TDivisionTeam;
import com.ruoyi.system.query.TDivisionTeamQuery;

import java.util.List;

/**
 * <p>
 * 分队管理 服务类
@@ -27,4 +29,7 @@
     * @return
     */
    boolean isExit(TDivisionTeam dto);



}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDivisionTeamServiceImpl.java

@@ -10,6 +10,7 @@
import com.ruoyi.system.service.TDivisionTeamService;
import org.springframework.stereotype.Service;

import java.util.Collections;
import java.util.List;

/**
@@ -40,4 +41,5 @@
            return this.count(Wrappers.lambdaQuery(TDivisionTeam.class).eq(TDivisionTeam::getTeamName, dto.getTeamName())) > 0;
        }
    }

}