lyf
/
fxkh-txl-service
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

登录返回行政区划名称

master
徐杰盟 2024-05-29 15:51:37 +08:00
parent a4933ac0fc
commit 7d08291ec5
6 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/whdc/mapper/AddressBookMapper.java
View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.whdc.model.dto.AddressBootDto;
import com.whdc.model.entity.AddressBook;
import com.whdc.model.vo.AddressBookVo;
import com.whdc.model.vo.ExcelABVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -21,5 +20,6 @@ public interface AddressBookMapper extends BaseMapper<AddressBook> {
List<AddressBook> find(@Param("dto") AddressBook dto);
List<AddressBook> getListByAdnm(@Param("adnm") String adnm);
AddressBookVo getVoById(@Param("id") Integer id);
}

3
src/main/java/com/whdc/model/dto/UserRoleDto.java
View File

@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
/**
* Description:
@ -25,6 +26,6 @@ public class UserRoleDto {
@TableField("AB_ID")
@ApiModelProperty(value = "通讯录id")
@NotEmpty(message = "通讯录id不能为空", groups = { Update.class})
@NotNull(message = "通讯录id不能为空", groups = { Update.class})
private Integer abId;
}

2
src/main/java/com/whdc/model/entity/User.java
View File

@ -56,7 +56,7 @@ public class User extends Model<User> implements Serializable {
@TableField("AB_ID")
@ApiModelProperty(value = "通讯录id")
@NotEmpty(message = "通讯录id不能为空", groups = {Insert.class, Update.class})
@NotNull(message = "通讯录id不能为空", groups = {Insert.class, Update.class})
private Integer abId;
@TableField("LAST_DATE")

3
src/main/java/com/whdc/model/vo/LoginVo.java
View File

@ -42,4 +42,7 @@ public class LoginVo implements Serializable {
@ApiModelProperty(value = "行政区划编码")
private String adcd;
@ApiModelProperty(value = "组织单位名称")
private String oname;
}

14
src/main/java/com/whdc/service/impl/UserServiceImpl.java
View File

@ -13,6 +13,7 @@ import com.whdc.model.dto.LoginDto;
import com.whdc.model.dto.UserDto;
import com.whdc.model.entity.AddressBook;
import com.whdc.model.entity.User;
import com.whdc.model.vo.AddressBookVo;
import com.whdc.model.vo.LoginVo;
import com.whdc.service.IUserService;
import com.whdc.utils.HttpUtil;
@ -78,7 +79,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
LoginVo out = new LoginVo();
BeanUtils.copyProperties(sysUser, out);
AddressBook book = addressBookMapper.selectById(sysUser.getAbId());
AddressBookVo book = addressBookMapper.getVoById(sysUser.getAbId());
if (Objects.nonNull(book)){
String adcd = book.getAdcd();
if (StringUtils.isNotBlank(adcd)) {
@ -92,8 +93,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
out.setAdcd(adcd);
}
}
out.setName(book.getName());
out.setOname(book.getOname());
if (StringUtils.isNotBlank(book.getAdnm())){
out.setOname(book.getAdnm());
}
}
return out;
@ -209,6 +215,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
}
out.setName(addressBook.getName());
out.setOname(addressBook.getOname());
AddressBookVo book = addressBookMapper.getVoById(sysUser.getAbId());
if (StringUtils.isNotBlank(book.getAdnm())){
out.setOname(book.getAdnm());
}
return out;
}

12
src/main/resources/mapper/AddressBookMapper.xml
View File

@ -64,4 +64,16 @@
</select>
<select id="byId" resultType="com.whdc.model.vo.AddressBookVo">
SELECT
AB.*,IF(O.NAME IS NULL,UD.NAME,O.NAME) ONAME,A.ADNM
FROM
ADDRESS_BOOK AB
LEFT JOIN ORGANIZATION O ON AB.ORGANIZATION = O.ID
LEFT JOIN UNIT_DICT UD ON AB.ORGANIZATION = UD.ID
LEFT JOIN ADINFO A ON AB.ADCD = A.ADCD
WHERE AB.id = #{id}
</select>
</mapper>