diff --git a/src/main/java/com/whdc/controller/AddressBookController.java b/src/main/java/com/whdc/controller/AddressBookController.java index 5d7c453..b194feb 100644 --- a/src/main/java/com/whdc/controller/AddressBookController.java +++ b/src/main/java/com/whdc/controller/AddressBookController.java @@ -3,6 +3,7 @@ package com.whdc.controller; import cn.dev33.satoken.stp.StpUtil; import com.whdc.model.dto.AddressBootDto; +import com.whdc.model.entity.AbUdR; import com.whdc.model.entity.AddressBook; import com.whdc.model.entity.User; import com.whdc.model.enums.Role; @@ -12,10 +13,7 @@ import com.whdc.model.group.Insert; import com.whdc.model.group.Update; import com.whdc.model.vo.AddressBookVo; import com.whdc.model.vo.FcVo; -import com.whdc.service.IAddressBookService; -import com.whdc.service.IOrganizationService; -import com.whdc.service.IUserService; -import com.whdc.service.IVersionsService; +import com.whdc.service.*; import com.whdc.utils.ResultJson; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -50,6 +48,9 @@ public class AddressBookController { @Autowired private IOrganizationService organizationsService; + @Autowired + private IAbUdRService abUdRService; + // @ApiOperation(value = "查询所有") @@ -104,6 +105,9 @@ public class AddressBookController { }else{ userService.register( model.getPhone(), model.getId(),model.getRole()); } + + // 添加关联关系 + abUdRService.save(new AbUdR(model.getId(),Integer.valueOf(model.getOrganization()),null,model.getType())); } return ResultJson.ok(save); @@ -160,7 +164,14 @@ public class AddressBookController { // versionsService.save(new Versions(null, JSON.toJSONString(model),model.getId(),++version,model.getCreateId(),new Date(), VersionsType.UPDATE.getName())); versionsService.saveInfo(model,VersionsType.UPDATE); - return ResultJson.ok(service.updateById(model)); + boolean data = service.updateById(model); + if (data) { + abUdRService.lambdaUpdate() + .set(AbUdR::getDictId,model.getOrganization()) + .eq(AbUdR::getAdId,model.getId()); + } + + return ResultJson.ok(data); } @ApiOperation(value = "修改权限") diff --git a/src/main/java/com/whdc/model/entity/AbUdR.java b/src/main/java/com/whdc/model/entity/AbUdR.java index 082678f..afeae8e 100644 --- a/src/main/java/com/whdc/model/entity/AbUdR.java +++ b/src/main/java/com/whdc/model/entity/AbUdR.java @@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Data; -import lombok.EqualsAndHashCode;import lombok.experimental.Accessors; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; import com.whdc.model.group.Insert; import com.whdc.model.group.Update; import javax.validation.constraints.NotEmpty; @@ -25,6 +28,8 @@ import java.util.Date; @Accessors(chain = true) @ApiModel(description = "用户单位字典关联表") @TableName("FXKH_TXL.AB_UD_R") +@AllArgsConstructor +@NoArgsConstructor public class AbUdR extends Model implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/whdc/model/entity/AddressBook.java b/src/main/java/com/whdc/model/entity/AddressBook.java index 8630bd1..7e43b53 100644 --- a/src/main/java/com/whdc/model/entity/AddressBook.java +++ b/src/main/java/com/whdc/model/entity/AddressBook.java @@ -90,5 +90,7 @@ public class AddressBook extends Model implements Serializable { @NotEmpty(message = "权限不能为空", groups = {Insert.class}) private String role; - + @TableField(exist = false) + @ApiModelProperty(value = "0:组织,1:单位") + private String type; } \ No newline at end of file