审批设置单位列表

src/dashoo.cn/backend/api/business/auditsetting/oilauditsetting.go

@@ -40,3 +40,7 @@ type OilAuditUser struct {
 	ModifiedUserId int       `xorm:"INT(10)"`
 	ModifiedBy     string    `xorm:"VARCHAR(50)"`
 }
+type UnitDepart struct {
+	UnitId  int
+	Unit    string
+}

src/dashoo.cn/backend/api/business/auditsetting/oilauditsettingService.go

@@ -25,6 +25,13 @@ func (s *OilAuditSettingService) GetAuditStepRoleEntity(tablename string, organi
 	return
 }
 
+func (s *OilAuditSettingService) GetDepartmentList(userids string) (deplist []UnitDepart) {
+	sql := "Select UnitId, Unit from Base_User where Id in ("+ userids +")"
+		s.DBE.SQL(sql).Find(&deplist)
+	return deplist
+}
+
+
 //根据用户角色获取用户列表
 func (s *OilAuditSettingService) GetUserByRole(roleid string, acccode string) (utree []userRole.Base_RoleList) {
 	users := make([]userRole.Base_RoleList, 0)

src/dashoo.cn/backend/api/controllers/system/auditsetting.go

@@ -190,7 +190,7 @@ func (this *OilAuditSettingController) AddEntity() {
 	fmt.Println(audits)
 	var model auditsetting.Base_OilAuditSetting
 	var audituser auditsetting.OilAuditUser
-	var org  organize.Base_Organize
+	//var org  organize.Base_Organize
 	var jsonBlob = this.Ctx.Input.RequestBody
 	svc := auditsetting.GetOilAuditSettingService(utils.DBE)
 
@@ -198,12 +198,16 @@ func (this *OilAuditSettingController) AddEntity() {
 	model.CreateOn = time.Now()
 	model.CreateBy = this.User.Realname
 	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-	//model.OrganizeId, _ = utils.StrTo(this.User.DepartmentId).Int()
-	svc.GetEntityById(this.User.DepartmentId, &org)
-	model.OrganizeId = org.Parentid
-	var org1  organize.Base_Organize
-	svc.GetEntityById(org.Parentid, &org1)
-	model.OrganizeName = org1.Fullname
+	var orgnizename string
+	var orglist []auditsetting.UnitDepart
+	orglist = svc.GetDepartmentList(audits)
+	for i:= 0; i<len(orglist); i++ {
+		if strings.Contains(orgnizename, orglist[i].Unit) == false{
+			orgnizename = fmt.Sprint(orgnizename, ",", orglist[i].Unit)
+		}
+	}
+	orgnizename = strings.Trim(orgnizename,",")
+	model.OrganizeName = orgnizename
 
 	var errinfo ErrorDataInfo
 	//var modelsele auditsetting.Base_OilAuditSetting
@@ -219,7 +223,7 @@ func (this *OilAuditSettingController) AddEntity() {
 
 	var err error
 	_, err = svc.InsertEntityBytbl(OilAuditSettingName, &model)
-	if (err == nil) {
+	if err == nil {
 		for _, Id := range auditIds {
 			var user userRole.Base_User
 			var org1  organize.Base_Organize
@@ -238,8 +242,6 @@ func (this *OilAuditSettingController) AddEntity() {
 		}
 	}
 
-
-
 	if err == nil {
 		//新增
 		errinfo.Message = "添加成功！"
@@ -406,6 +408,20 @@ func (this *OilAuditSettingController) IsAccess() {
 	this.ServeJSON()
 }
 
+// @Title 获取部门
+// @Description 获取部门
+// @Success 200 {object} auditsetting.Base_OilAuditSetting
+// @router /getmydepartment/:id [get]
+//func (this *OilAuditSettingController) GetDepartment() {
+//	UserId := this.Ctx.Input.Param(":id")
+//
+//	var user userRole.Base_User
+//	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
+//	rsvc.GetEntityById(UserId, &user)
+//	this.Data["json"] = &user.Departmentname
+//	this.ServeJSON()
+//}
+
 // @Title 根据部门获取人员
 // @Description 根据部门获取人员
 // @router /getauditerbydept/:deptId [get]