user role

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

@@ -12,8 +12,10 @@ type Base_OilAuditSetting struct {
 	AuditStepName  string    `xorm:"comment('审批步骤名称') VARCHAR(50)"`
 	RoleId         int       `xorm:"not null default 0 comment('角色ID') INT(10)"`
 	RoleName       string    `xorm:"comment('角色名称') VARCHAR(50)"`
+	/*
 	UserId         string    `xorm:"comment('审批人ID') VARCHAR(50)"`
 	UserName       string    `xorm:"comment('审批人') VARCHAR(50)"`
+	*/
 	WorkFlowCord   string    `xorm:"comment('工作流编码') VARCHAR(50)"`
 	WorkFlowName   string    `xorm:"comment('工作流名称') VARCHAR(50)"`
 	Remark         string    `xorm:"comment('备注') VARCHAR(500)"`

src/dashoo.cn/backend/api/controllers/casbin/organize.go

@@ -39,15 +39,16 @@ func (this *OrganizesController) List() {
 	svcPerm := permission.GetPermissionService(utils.DBE)
 	isauth := svcPerm.IsAuthorized(this.User.Id, "Administrator")
 	topid := ""
-	if isauth {
-		// paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
-		topid = "0" //paramSvc.GetBaseparameterMessage("", "paramset", "HeadquartersID") // 总公司Id
-	} else {
+	where := " 1=1 "
+	if !isauth && !svcPerm.IsAdmin(this.User.Id) {
 		topid = svc.GetMyUnitDepartmentId(this.User.DepartmentId)
+		depids := svc.GetAllChildById(topid)
+		where = "( Createuserid=" + this.User.Id + " or id in (" + depids + "))"
+	} else {
+		// paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+		// topid = "0" //paramSvc.GetBaseparameterMessage("", "paramset", "HeadquartersID") // 总公司Id
 	}
 
-	depids := svc.GetAllChildById(topid)
-	where := "( Createuserid=" + this.User.Id + " or id in (" + depids + "))"
 	keyword := this.GetString("keyword")
 	parentid := this.GetString("parentid")
 	IsInnerOrganize := this.GetString("IsInnerOrganize")

src/dashoo.cn/backend/api/controllers/casbin/role.go

@@ -105,16 +105,16 @@ func (this *RoleController) OrgAllList() {
 	var user userRole.Base_User
 	svc.GetEntityById(this.User.Id, &user)
 	ids := ""
+	where := " 1=1 "
 	//判断超级管理员和有查看所有数据权限的用户
 	svcPerm := permission.GetPermissionService(utils.DBE)
 	isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.marketAccess.AllRecord")
-	if svcPerm.IsAdmin(this.User.Id) || isauth {
-		ids = svc.GetAllChildById("100000000")
-	} else {
+	if !svcPerm.IsAdmin(this.User.Id) && !isauth {
 		unitId := svc.GetMyUnitDepartmentId(this.User.DepartmentId)
 		ids = svc.GetAllChildById(unitId)
+		where = " Id in ( " + ids + " )"
 	}
-	where := " Id in ( " + ids + " )"
+
 
 	list := make([]commonorgnize.Base_Organize, 0)
 	svc.GetEntities(&list, where)

src/dashoo.cn/backend/api/controllers/rtx/rtx.go

@@ -140,3 +140,27 @@ func (this *RtxController) SyncUserDept() {
 		fmt.Println(tmp_user)
 	}
 }
+
+// @Title 修改全部默认密码
+// @Description 修改密码
+// @Success	200	{object}
+// @router /changeallpwd [get]
+func (this *RtxController) ChangeAllpwd() {
+
+	svc := oilrtx.GetRtxService(utils.DBE)
+	//pwd, key, _ := utils.TripleDesEncrypt("Dgyt@lims") // yanshi@lims
+	pwd, key, _ := utils.TripleDesEncrypt("123456")
+	_,err:= svc.DBE.Exec("Update Base_User set UserPassword='"+pwd+"',PublicKey='"+key+"' where UserName!='yanshi' and IsCompanyUser='0'")
+	var errinfo ErrorInfo
+	if err != nil {
+		errinfo.Message = "修改失败！" + err.Error()
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "密码修改成功"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}

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

@@ -6,6 +6,7 @@ import (
 	"dashoo.cn/backend/api/business/organize"
 	"dashoo.cn/backend/api/business/role"
 	. "dashoo.cn/backend/api/controllers"
+	"dashoo.cn/business2/permission"
 	"dashoo.cn/business2/userRole"
 	"dashoo.cn/utils"
 	"encoding/json"
@@ -24,17 +25,18 @@ type OilAuditSettingController struct {
 // @router /list [get]
 func (this *OilAuditSettingController) GetEntityList() {
 
+	svcPerm := permission.GetPermissionService(utils.DBE)
 	//获取分页信息
 	page := this.GetPageInfoForm()
 	where := " 1=1 "
 	orderby := "Id"
-	asc := false
+	asc := true
 	Order := this.GetString("Order")
 	Prop := this.GetString("Prop")
 	if Order != "" && Prop != "" {
 		orderby = Prop
-		if Order == "asc" {
-			asc = true
+		if Order != "asc" {
+			asc = false
 		}
 	}
 	OrganizeId := this.GetString("OrganizeId")
@@ -48,13 +50,13 @@ func (this *OilAuditSettingController) GetEntityList() {
 	Remark := this.GetString("Remark")
 	CreateOn := this.GetString("CreateOn")
 
-	OrganizeId = this.User.DepartmentId //无权限看所有时，只看当前部门的数据
-	if OrganizeId != "" {
-		where = where + " and OrganizeId = '" + OrganizeId + "'"
+	if !svcPerm.IsAdmin(this.User.Id) {
+		OrganizeId = this.User.DepartmentId //无权限看所有时，只看当前部门的数据
+		if OrganizeId != "" {
+			where = where + " and OrganizeId = '" + OrganizeId + "'"
+		}
 	}
 
-
-
 	if OrganizeName != "" {
 		where = where + " and OrganizeName like '%" + OrganizeName + "%'"
 	}

src/dashoo.cn/frontend_web/src/pages/login.vue

@@ -63,7 +63,7 @@
       }
 
       return {
-        loginMode: 1,
+        loginMode: parseInt(process.client ? (window.localStorage.getItem('loginMode') ? window.localStorage.getItem('loginMode') : 1) : 1),
         model: model,
         rules: rules,
         error: null,

src/dashoo.cn/frontend_web/src/pages/system/auditsetting/_opera/operation.vue

@@ -21,11 +21,11 @@
       </div>
       <el-form label-width="110px" ref="EntityForm" :model="formData">
         <el-row>
-          <el-col :span="6">
+          <!--<el-col :span="6">
             <el-form-item label="单位名称" required>
               <el-input v-model="formData.OrganizeName" placeholder="请输入" Readonly style="width: 100%"></el-input>
             </el-form-item>
-          </el-col>
+          </el-col>-->
 
           <el-col :span="6">
             <el-form-item label="审批步骤" required>

src/dashoo.cn/frontend_web/src/pages/system/userrole.vue

@@ -122,7 +122,7 @@
       <el-form label-width="110px" style="text-align:right">
         <el-row :gutter="10">
           <el-col :span="10">
-            <el-card style="width: 100%;height: calc(100vh - 283px);margin-top:0px">
+            <el-card style="width: 100%;height: calc(100vh - 283px);margin-top:0px;overflow: auto;">
               <div slot="header" class="clearfix">
                 <span>请选择部门</span>
               </div>
@@ -131,7 +131,7 @@
           </el-col>
 
           <el-col :span="14">
-            <el-card style="width: 100%;height: calc(100vh - 283px);margin-top:0px">
+            <el-card style="width: 100%;height: calc(100vh - 283px);margin-top:0px; overflow: auto;">
               <el-table :data="userOptions" style="width: 100%;" height="calc(100vh - 353px)" ref="multipleTable"
                 @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="55"></el-table-column>