律师端开发

alien-entity/src/main/java/shop/alien/entity/store/vo/LawyerUserVo.java

@@ -301,9 +301,15 @@ public class LawyerUserVo implements Serializable {
     @ApiModelProperty(value = "登录Token")
     private String token;
 
+    @ApiModelProperty(value = "一级法律场景id")
+    private String firstLevelScenarioId;
+
     @ApiModelProperty(value = "一级法律场景")
     private String firstLevelScenario;
 
+    @ApiModelProperty(value = "律师擅长法律场景id")
+    private String problemScenarioId;
+
     @ApiModelProperty(value = "律师擅长法律场景")
     private String scenarioNames;
 
@@ -312,6 +318,5 @@ public class LawyerUserVo implements Serializable {
 
 
 
-
 }
 

alien-entity/src/main/java/shop/alien/mapper/LawyerUserMapper.java

@@ -92,36 +92,6 @@ public interface LawyerUserMapper extends BaseMapper<LawyerUser> {
 Integer updateLawyerUser(LawyerUser user);
 
 
-//   @Select("<script>" +
-//        "SELECT " +
-//        "user.id, " +
-//        "user.phone, " +
-//        "user.`name`, " +
-//        "user.firm_id, " +
-//        "user.head_img, " +
-//        "user.personal_introduction, " +
-//        "user.order_receiving_status, " +
-//        "user.practice_start_date, " +
-//        "firm.firm_name, " +
-//        "firm.payment_account, " +
-//        "GROUP_CONCAT(area.problem_scenario_id SEPARATOR ',') AS problem_scenario_ids, " +
-//        "GROUP_CONCAT(a.name SEPARATOR ',') AS scenarioNames, " +
-//        "(SELECT GROUP_CONCAT(`name` SEPARATOR ',') FROM lawyer_legal_problem_scenario WHERE level = 1) AS FirstLevelScenario, " +
-//        "b.expertise_area_info " +
-//        "FROM `lawyer_user` user " +
-//        "LEFT JOIN law_firm firm ON firm.id = user.firm_id " +
-//        "LEFT JOIN lawyer_service_area area ON area.lawyer_user_id = user.id " +
-//        "LEFT JOIN lawyer_legal_problem_scenario a ON a.id = area.problem_scenario_id " +
-//        "LEFT JOIN lawyer_expertise_area b ON b.id = user.specialty_fields " +
-//        "WHERE user.id = #{id} " +
-//        "GROUP BY " +
-//        "user.id, user.phone, user.`name`, user.firm_id, user.head_img, " +
-//        "user.personal_introduction, user.order_receiving_status, user.practice_start_date, " +
-//        "firm.firm_name, firm.payment_account, b.expertise_area_info " +
-//        "LIMIT 1 " +
-//        "</script>")
-//LawyerUserVo selectInfo(@Param("lawyerId") Integer lawyerId);
-
 
    @Select("<script>" +
            "SELECT " +
@@ -136,9 +106,12 @@ Integer updateLawyerUser(LawyerUser user);
            "user.address , " +
            "firm.firm_name  AS firmName, " +
            "firm.payment_account AS paymentNum, " +
-           "GROUP_CONCAT(area.problem_scenario_id SEPARATOR ',') AS problem_scenario_ids, " +
+           "GROUP_CONCAT(area.problem_scenario_id SEPARATOR ',') AS problemScenarioId, " +
            "GROUP_CONCAT(a.name SEPARATOR ',') AS scenarioNames, " +
-           "(SELECT GROUP_CONCAT(`name` SEPARATOR ',') FROM lawyer_legal_problem_scenario WHERE level = 1) AS firstLevelScenario, " +
+           "(SELECT GROUP_CONCAT(`id` SEPARATOR ',') FROM lawyer_legal_problem_scenario WHERE level = 1) " +
+           "AS firstLevelScenarioId, " +
+           "(SELECT GROUP_CONCAT(`name` SEPARATOR ',') FROM lawyer_legal_problem_scenario WHERE level = 1) " +
+           "AS firstLevelScenario, " +
            "b.expertise_area_info AS areaInfo " +
            "FROM " +
            "lawyer_user user " +
@@ -147,7 +120,12 @@ Integer updateLawyerUser(LawyerUser user);
            "LEFT JOIN lawyer_legal_problem_scenario a ON a.id = area.problem_scenario_id " +
            "LEFT JOIN lawyer_expertise_area b ON b.id = user.specialty_fields " +
            "<where>" +
-           "<if test='lawyerId != null'>user.id = #{lawyerId}</if>" +
+           "<if test='lawyerId != null'>user.id = #{lawyerId} AND </if>" +
+           "firm.delete_flag = 0 AND " +
+           "user.delete_flag = 0 AND " +
+           "area.delete_flag = 0 AND " +
+           "a.delete_flag = 0 AND " +
+           "b.delete_flag = 0" +
            "</where>" +
            "GROUP BY " +
            "user.id, user.phone, user.`name`, user.firm_id, user.head_img, " +

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

@@ -545,6 +545,8 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
             return R.fail("修改律师信息失败");
         }
 
+//        lawFirmMapper.updateById(lawyerUser)
+
         // 查询更新后的律师信息
         LawyerUser updatedLawyer = this.getById(lawyerUserVo.getId());
         log.info("更新律师用户信息成功，律师ID={}", lawyerUserVo.getId());