添加防错检验

alien-entity/src/main/java/shop/alien/entity/store/LawyerExpertiseArea.java

@@ -25,7 +25,7 @@ public class LawyerExpertiseArea extends Model<LawyerExpertiseArea> {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "图片描述")
+    @ApiModelProperty(value = "领域名称")
     @TableField("expertise_area_info")
     private String expertiseAreaInfo;
 

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/LawyerExpertiseAreaServiceImpl.java

@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.LawyerExpertiseArea;
 import shop.alien.lawyer.service.LawyerExpertiseAreaService;
@@ -39,7 +39,7 @@ public class LawyerExpertiseAreaServiceImpl extends ServiceImpl<LawyerExpertiseA
         Page<LawyerExpertiseArea> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<LawyerExpertiseArea> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(LawyerExpertiseArea::getDeleteFlag, 0);
-        if (StringUtils.hasText(expertiseAreaInfo)) {
+        if (StringUtils.isNotBlank(expertiseAreaInfo)) {
             queryWrapper.like(LawyerExpertiseArea::getExpertiseAreaInfo, expertiseAreaInfo);
         }
         queryWrapper.orderByDesc(LawyerExpertiseArea::getCreatedTime);
@@ -56,6 +56,11 @@ public class LawyerExpertiseAreaServiceImpl extends ServiceImpl<LawyerExpertiseA
             log.warn("新增领域信息失败：参数为空");
             return R.fail("参数不能为空");
         }
+        // 参数校验
+        if (StringUtils.isBlank(expertiseArea.getExpertiseAreaInfo())) {
+            log.warn("新增领域信息失败：领域名称为空");
+            return R.fail("领域名称不能为空");
+        }
 
         // 设置默认值
         if (expertiseArea.getDeleteFlag() == null) {

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/LawyerUserServiceImpl.java

@@ -521,8 +521,11 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
         BeanUtils.copyProperties(lawyer, lawyerUserVo);
 
         LawFirm lawFirm=lawFirmMapper.selectById(lawyer.getFirmId());
-        lawyerUserVo.setFirmName(lawFirm.getFirmName());
-        lawyerUserVo.setAddress(lawFirm.getAddress());
+        if (lawFirm!=null){
+            lawyerUserVo.setFirmName(lawFirm.getFirmName());
+            lawyerUserVo.setAddress(lawFirm.getAddress());
+        }
+
 
         // 为律师设置关联的法律问题场景列表
 //        List<LawyerUser> lawyerList = Collections.singletonList(lawyer);