Browse Source

发送人信息获取修改

dongbw 7 years ago
parent
commit
ff521eec51

+ 15 - 1
src/main/java/com/uas/ps/inquiry/model/Enterprise.java

@@ -4,7 +4,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -52,6 +51,12 @@ public class Enterprise implements Serializable {
     @Column(name = "en_businesscode")
     private  String businesscode;
 
+    /**
+     * 企业管理员UU
+     */
+    @Column(name = "en_adminuu")
+    private Long adminUU;
+
     public Long getUu() {
         return uu;
     }
@@ -92,6 +97,14 @@ public class Enterprise implements Serializable {
         this.businesscode = businesscode;
     }
 
+    public Long getAdminUU() {
+        return adminUU;
+    }
+
+    public void setAdminUU(Long adminUU) {
+        this.adminUU = adminUU;
+    }
+
     @Override
     public String toString() {
         return "Enterprise{" +
@@ -100,6 +113,7 @@ public class Enterprise implements Serializable {
                 ", enTel='" + enTel + '\'' +
                 ", enAddress='" + enAddress + '\'' +
                 ", businesscode='" + businesscode + '\'' +
+                ", adminUU=" + adminUU +
                 '}';
     }
 }

+ 2 - 2
src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -209,8 +209,8 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                             if (null != item.getUserUU() || null != item.getInquiry().getRecorderUU()) {
                                 model.setSenderUu(item.getUserUU() != null ? item.getUserUU() : item.getInquiry().getRecorderUU());
                             } else {
-                               User admin = userDao.findOne(item.getInquiry().getEnUU());
-                               model.setSenderUu(null != admin ? admin.getUserUU() : 0L);
+                               Enterprise enterprise = enterpriseDao.findOne(item.getInquiry().getEnUU());
+                               model.setSenderUu(null != enterprise ? enterprise.getAdminUU() : 0L);
                             }
                             model.setSmsType(SMS_TYPE);
                             model.setMailTemplate(MAIL_TEMP_ID);