押金管理bug修改

controllers/his_deposit_controller.go

@@ -244,7 +244,7 @@ func (this *HisDepositApiController) RechargeDetails() {
 		if list[i].TrialStatus == 1 {
 			sum = sum.Add(list[i].Deposit)
 		}
-		list[i].Name = service.GetCreateidName(list[i].CreateId)
+		list[i].Name = service.GetCreateidName(list[i].CreateId, orgid)
 		list[i].HisName = namemap[list[i].HisPatientId]
 		list[i].Starttime = fmt.Sprintf(time.Unix(list[i].Ctime, 0).Format("2006-01-02"))
 	}
@@ -923,7 +923,7 @@ func (this *HisDepositApiController) RefundList() {
 		return
 	}
 	for i := 0; i < len(depo); i++ {
-		depo[i].Name = service.GetCreateidName(depo[i].CreateId)
+		depo[i].Name = service.GetCreateidName(depo[i].CreateId, orgid)
 		depo[i].HisName = namemap[depo[i].HisPatientId]
 		if depo[i].Mtime > depo[i].Ctime {
 			depo[i].Starttime = fmt.Sprintf(time.Unix(depo[i].Mtime, 0).Format("2006-01-02 15:04:05"))

models/his_deposit_models.go

@@ -99,6 +99,15 @@ func (CreateUser) TableName() string {
 	return "sgj_users.sgj_user_admin"
 }
 
+type CreateUserNames struct {
+	ID       int64  `gorm:"column:id" json:"id" form:"id"`
+	UserName string `gorm:"column:user_name" json:"user_name" form:"user_name"`
+}
+
+func (CreateUserNames) TableName() string {
+	return "sgj_users.sgj_user_admin_role"
+}
+
 type Summary struct {
 	HisName    string          `json:"his_name"`    //患者姓名
 	SumDecimal decimal.Decimal `json:"sum_decimal"` //充值金额

service/his_deposit_service.go

@@ -210,10 +210,16 @@ func GetMonth() (int64, int64) {
 }
 
 //获取创建者的姓名
-func GetCreateidName(id int64) string {
-	var tmp models.CreateUser
-	XTReadDB().Select("name").Where("id = ?", id).Find(&tmp)
-	return tmp.Name
+//原先的(sgj_users.sgj_user_admin)
+//新加的(sgj_users.sgj_user_admin_role)
+func GetCreateidName(id, orgid int64) string {
+	//var tmp models.CreateUser
+	//XTReadDB().Select("name").Where("id = ?", id).Find(&tmp)
+	//return tmp.Name
+
+	var tmp models.CreateUserNames
+	XTReadDB().Select("user_name").Where("admin_user_id = ? and org_id = ?", id, orgid).Order("ctime desc").Find(&tmp)
+	return tmp.UserName
 }
 
 //审核通过