解决冲突

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java

@@ -216,7 +216,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
                 responseVO.setPractitionerTypeId(practitionerType);
                 responseVO.setPractitionerBasicInfo(basicInfo);
                 responseVO.setLoginTimes(logTimes);
-                responseVO.setCanSeeSalaryList(practitionerInfo.getCanLoginDyd());
+                responseVO.setCanSeeSalaryList(practitionerInfo.getCanSeeSalaryList());
                 responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
 //            }
         }else{

yd-api/src/main/java/com/yd/dal/entity/customer/practitioner/PractitionerInfo.java

@@ -13,7 +13,7 @@ public class PractitionerInfo {
     private String weChatId;
     private String qqId;
     private String practitionerRegNo;
-    private Long canLoginDyd;
+    private Long canSeeSalaryList;
 
     public Long getCustomerId() {
         return customerId;
@@ -111,11 +111,11 @@ public class PractitionerInfo {
         this.gender = gender;
     }
 
-    public Long getCanLoginDyd() {
-        return canLoginDyd;
+    public Long getCanSeeSalaryList() {
+        return canSeeSalaryList;
     }
 
-    public void setCanLoginDyd(Long canLoginDyd) {
-        this.canLoginDyd = canLoginDyd;
+    public void setCanSeeSalaryList(Long canSeeSalaryList) {
+        this.canSeeSalaryList = canSeeSalaryList;
     }
 }

yd-api/src/main/resources/mapper/customer/AclPractitionerMapper.xml

@@ -1343,7 +1343,7 @@
     <result column="weChatId" property="weChatId" />
     <result column="qqId" property="qqId" />
     <result column="practitionerRegNo" property="practitionerRegNo" />
-    <result column="canLoginDyd" property="canLoginDyd" />
+    <result column="canSeeSalaryList" property="canSeeSalaryList" />
   </resultMap>
 
   <select id="findPractitionerInfoByLogin" resultMap="practitioner_info_map">
@@ -1360,14 +1360,14 @@
       p.wechat_id as weChatId,
       p.qq_id as qqId,
       p.practitioner_reg_no as practitionerRegNo,
-      p.can_login_dyd as canLoginDyd
+      p.can_see_salary_list as canSeeSalaryList
     from ag_acl_customer c inner join ag_acl_practitioner p on c.id = p.customer_id
                            left join ag_acl_insurer_branch b on p.insurer_branch_id = b.id
                            left join ag_acl_practitioner_setting s on p.id = s.practitioner_id
                            left join ag_md_drop_options o on s.practitioner_level = o.id
     where c.login = #{mobileNo}
     and p.is_active = 1
-    and can_login_dyd != 0
+    and (p.can_login_dyd != 0 OR p.can_login_dyd is null)
   </select>
 
   <select id="findByCustomerIdIsActive" resultType="com.yd.dal.entity.customer.AclPractitioner">