Commit a024d669 by java-lixy

OA账号登录 记录用户名

parent 4465ef2e
...@@ -33,6 +33,7 @@ public class FrontReportBean extends BaseBean{ ...@@ -33,6 +33,7 @@ public class FrontReportBean extends BaseBean{
private String dealResult; //varchar(255) DEFAULT NULL COMMENT '处理结论 1 投诉 2 举报无效 3 举报属实', private String dealResult; //varchar(255) DEFAULT NULL COMMENT '处理结论 1 投诉 2 举报无效 3 举报属实',
private String exchangeBeforeUser; //varchar(255) DEFAULT NULL COMMENT '移交/转交前用户id', private String exchangeBeforeUser; //varchar(255) DEFAULT NULL COMMENT '移交/转交前用户id',
private String exchangeAfterUser; //varchar(255) DEFAULT NULL COMMENT '移交/转交后用户id(只记录最新的移交用户,此处不记录历史)', private String exchangeAfterUser; //varchar(255) DEFAULT NULL COMMENT '移交/转交后用户id(只记录最新的移交用户,此处不记录历史)',
private String oaName;
private String createBy; //创建人 private String createBy; //创建人
private Timestamp createDate; //创建时间 private Timestamp createDate; //创建时间
private String updateBy; //更新人\ private String updateBy; //更新人\
...@@ -283,4 +284,12 @@ public class FrontReportBean extends BaseBean{ ...@@ -283,4 +284,12 @@ public class FrontReportBean extends BaseBean{
public void setIds(List<String> ids) { public void setIds(List<String> ids) {
this.ids = ids; this.ids = ids;
} }
public String getOaName() {
return oaName;
}
public void setOaName(String oaName) {
this.oaName = oaName;
}
} }
...@@ -11,6 +11,7 @@ import com.ejweb.modules.front.report.dao.FrontReportDao; ...@@ -11,6 +11,7 @@ import com.ejweb.modules.front.report.dao.FrontReportDao;
import com.ejweb.modules.front.report.entity.FrontReportEntity; import com.ejweb.modules.front.report.entity.FrontReportEntity;
import com.ejweb.modules.front.upload.util.ReportAttachmentUtils; import com.ejweb.modules.front.upload.util.ReportAttachmentUtils;
import com.ejweb.modules.sys.entity.User; import com.ejweb.modules.sys.entity.User;
import com.ejweb.modules.sys.utils.UserUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -36,6 +37,11 @@ public class FrontReportService extends CrudService<FrontReportDao,FrontReportEn ...@@ -36,6 +37,11 @@ public class FrontReportService extends CrudService<FrontReportDao,FrontReportEn
bean.setReportStatus("0"); bean.setReportStatus("0");
if (bean.getReportSource().equals("oa")){
User oaUser = UserUtils.getUser();
bean.setOaName(oaUser.getName());
}
// 查询管理员 // 查询管理员
User user = dao.getUser(new User()); User user = dao.getUser(new User());
if(user!= null){ if(user!= null){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment