feature(跟进记录报表): 不显示已离职人员信息、合同权限问题

opms_parent/app/dao/contract/internal/ctr_contract.go

@@ -893,15 +893,17 @@ func (d *CtrContractDao) checkColumnsName(dataScope map[string]interface{}, args
 	delete(dataScope, "roles")
 	delete(dataScope, "posts")
 	delete(dataScope, bigColumns)
-	for k, v := range dataScope {
-		if data, ok := colsContrast[k]; ok {
-			dataScope[data.(string)] = v
+	if len(colsContrast) > 0 {
+		for k, v := range dataScope {
+			if data, ok := colsContrast[k]; ok {
+				dataScope[data.(string)] = v
+			}
+			delete(dataScope, k)
+			delete(colsContrast, k)
+		}
+		for k, v := range colsContrast {
+			dataScope[k] = v
 		}
-		delete(dataScope, k)
-		delete(colsContrast, k)
-	}
-	for k, v := range colsContrast {
-		dataScope[k] = v
 	}
 	return specialFlag, userCols, orColsMap
 }

opms_parent/app/service/base.go

@@ -279,7 +279,7 @@ func GetUsersByRoleCode(ctx context.Context, roleCode []string, pageSize ...int)
 	srv := micro_srv.InitMicroSrvClient("User", "micro_srv.auth")
 	defer srv.Close()
 	resp := &comm_def.CommonMsg{}
-	req := &SysUserSearchReq{Roles: roleCode}
+	req := &SysUserSearchReq{Roles: roleCode, Status: "10"}
 	if len(pageSize) > 0 {
 		req.PageSize = pageSize[0]
 	}